[Xfce4-commits] [xfce/xfwm4] 04/05: trace: rework traces
noreply at xfce.org
noreply at xfce.org
Sat Mar 31 15:26:40 CEST 2018
This is an automated email from the git hooks/post-receive script.
o l i v i e r p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfwm4.
commit a67f5d0ba37e3043a19f9dc1de0ef5adb96384a8
Author: Olivier Fourdan <fourdan at xfce.org>
Date: Sat Mar 31 15:23:07 2018 +0200
trace: rework traces
Make traces more consistent.
---
src/client.c | 223 ++++++++++++++++++--------------------------
src/compositor.c | 228 ++++++++++++++++++++++-----------------------
src/cycle.c | 22 ++---
src/display.c | 20 ++--
src/event_filter.c | 72 +++++++-------
src/events.c | 125 +++++++++++--------------
src/focus.c | 48 +++++-----
src/frame.c | 120 ++++++++++++------------
src/hints.c | 102 ++++++++++----------
src/keyboard.c | 11 +--
src/main.c | 4 +-
src/menu.c | 37 ++++----
src/misc.c | 9 +-
src/moveresize.c | 35 ++++---
src/mypixmap.c | 23 +++--
src/mywindow.c | 16 ++--
src/netwm.c | 125 ++++++++++++-------------
src/parserc.c | 28 +++---
src/placement.c | 26 +++---
src/screen.c | 45 ++++-----
src/settings.c | 12 +--
src/stacking.c | 37 ++++----
src/startup_notification.c | 3 +-
src/tabwin.c | 38 ++++----
src/transients.c | 46 +++++----
src/ui_style.c | 8 +-
src/wireframe.c | 6 +-
src/workspaces.c | 16 ++--
src/xsync.c | 16 ++--
29 files changed, 715 insertions(+), 786 deletions(-)
diff --git a/src/client.c b/src/client.c
index 6a7c2b3..1685a75 100644
--- a/src/client.c
+++ b/src/client.c
@@ -128,7 +128,7 @@ clientInstallColormaps (Client *c)
int i;
g_return_if_fail (c != NULL);
- TRACE ("entering clientInstallColormaps");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
installed = FALSE;
if (c->ncmap)
@@ -153,7 +153,7 @@ void
clientUpdateColormaps (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientUpdateColormaps");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (c->ncmap)
{
@@ -175,7 +175,7 @@ clientCreateTitleName (Client *c, gchar *name, gchar *hostname)
gchar *title;
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering clientCreateTitleName");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -204,7 +204,7 @@ clientUpdateName (Client *c)
gboolean refresh;
g_return_if_fail (c != NULL);
- TRACE ("entering clientUpdateName");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -251,7 +251,7 @@ clientRecomputeMaximizeSize (Client *c)
unsigned long maximization_flags = 0L;
g_return_if_fail (c != NULL);
- TRACE ("entering clientRecomputeMaximizeSize");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
/* Recompute size and position of maximized windows */
maximization_flags = c->flags & CLIENT_FLAG_MAXIMIZED;
@@ -268,8 +268,8 @@ clientUpdateAllFrames (ScreenInfo *screen_info, int mask)
guint i;
g_return_if_fail (screen_info != NULL);
+ TRACE ("entering");
- TRACE ("entering clientRedrawAllFrames");
for (c = screen_info->clients, i = 0; i < screen_info->client_count; c = c->next, i++)
{
unsigned short configure_flags = 0;
@@ -326,8 +326,7 @@ clientGrabButtons (Client *c)
ScreenInfo *screen_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientGrabButtons");
- TRACE ("grabbing buttons for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
if (screen_info->params->easy_click)
@@ -341,8 +340,7 @@ void
clientUngrabButtons (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientUngrabButtons");
- TRACE ("grabbing buttons for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
xfwm_device_ungrab_button (c->screen_info->display_info->devices, clientGetXDisplay (c),
AnyButton, AnyModifier, c->window);
@@ -356,9 +354,9 @@ urgent_cb (gpointer data)
c = (Client *) data;
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering urgent_cb, iteration %i", c->blink_iterations);
- screen_info = c->screen_info;
+ TRACE ("iteration %i", c->blink_iterations);
+ screen_info = c->screen_info;
if (c != clientGetFocus ())
{
/*
@@ -416,8 +414,7 @@ void
clientUpdateUrgency (Client *c)
{
g_return_if_fail (c != NULL);
-
- TRACE ("entering clientUpdateUrgency");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_SEEN_ACTIVE);
if (c->blink_timeout_id)
@@ -477,7 +474,7 @@ clientCoordGravitate (Client *c, int gravity, int mode, int *x, int *y)
int dx, dy;
g_return_if_fail (c != NULL);
- TRACE ("entering clientCoordGravitate");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
switch (gravity)
{
@@ -533,7 +530,7 @@ clientAdjustCoordGravity (Client *c, int gravity, XWindowChanges *wc, unsigned l
int tx, ty, dw, dh;
g_return_if_fail (c != NULL);
- TRACE ("entering clientAdjustCoordGravity");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
tx = wc->x;
ty = wc->y;
@@ -703,9 +700,8 @@ clientConfigure (Client *c, XWindowChanges * wc, unsigned long mask, unsigned sh
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
- TRACE ("entering clientConfigure");
- TRACE ("configuring client \"%s\" (0x%lx) %s, type %u", c->name,
- c->window, flags & CFG_CONSTRAINED ? "constrained" : "not contrained", c->type);
+ TRACE ("client \"%s\" (0x%lx) %s, type %u", c->name, c->window,
+ flags & CFG_CONSTRAINED ? "constrained" : "not contrained", c->type);
px = c->x;
py = c->y;
@@ -747,7 +743,7 @@ clientConfigure (Client *c, XWindowChanges * wc, unsigned long mask, unsigned sh
* TopIf, BottomIf nor Opposite ...
*/
case Above:
- TRACE ("Above");
+ TRACE ("above");
if (mask & CWSibling)
{
clientRaise (c, wc->sibling);
@@ -758,7 +754,7 @@ clientConfigure (Client *c, XWindowChanges * wc, unsigned long mask, unsigned sh
}
break;
case Below:
- TRACE ("Below");
+ TRACE ("below");
if (mask & CWSibling)
{
clientLower (c, wc->sibling);
@@ -850,7 +846,9 @@ clientReconfigure (Client *c, unsigned short flags)
{
XWindowChanges wc;
- TRACE ("entering clientReconfigure");
+ g_return_if_fail (c != NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
wc.x = c->x;
wc.y = c->y;
wc.width = c->width;
@@ -866,7 +864,6 @@ clientMoveResizeWindow (Client *c, XWindowChanges * wc, unsigned long mask)
unsigned short flags;
g_return_if_fail (c != NULL);
- TRACE ("entering clientMoveResizeWindow");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -938,7 +935,7 @@ clientMoveResizeWindow (Client *c, XWindowChanges * wc, unsigned long mask)
if ((screen_info->params->prevent_focus_stealing) && (screen_info->params->activate_action == ACTIVATE_ACTION_NONE))
{
mask &= ~(CWSibling | CWStackMode);
- TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
clientSetNetState (c);
}
@@ -960,8 +957,8 @@ clientGetMWMHints (Client *c)
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
- TRACE ("entering clientGetMWMHints client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -981,9 +978,7 @@ clientApplyMWMHints (Client *c, gboolean update)
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
-
- TRACE ("entering clientApplyMWMHints client \"%s\" (0x%lx)", c->name,
- c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -1097,9 +1092,7 @@ clientGetWMNormalHints (Client *c, gboolean update)
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
-
- TRACE ("entering clientGetWMNormalHints client \"%s\" (0x%lx)", c->name,
- c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!c->size)
{
@@ -1266,9 +1259,7 @@ clientGetWMProtocols (Client *c)
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
-
- TRACE ("entering clientGetWMProtocols client \"%s\" (0x%lx)", c->name,
- c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -1294,9 +1285,7 @@ static void
clientFree (Client *c)
{
g_return_if_fail (c != NULL);
-
- TRACE ("entering clientFree");
- TRACE ("freeing client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
clientClearFocus (c);
if (clientGetLastRaise (c->screen_info) == c)
@@ -1387,8 +1376,7 @@ static void
clientApplyInitialState (Client *c)
{
g_return_if_fail (c != NULL);
-
- TRACE ("entering clientApplyInitialState");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
/* We check that afterwards to make sure all states are now known */
if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED))
@@ -1397,7 +1385,7 @@ clientApplyInitialState (Client *c)
{
unsigned long mode = 0L;
- TRACE ("Applying client's initial state: maximized");
+ TRACE ("applying client's initial state: maximized");
mode = c->flags & CLIENT_FLAG_MAXIMIZED;
/* Unset fullscreen mode so that clientToggleMaximized() really change the state */
@@ -1407,28 +1395,28 @@ clientApplyInitialState (Client *c)
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
{
- TRACE ("Applying client's initial state: fullscreen");
+ TRACE ("applying client's initial state: fullscreen");
clientUpdateFullscreenState (c);
}
if (FLAG_TEST_AND_NOT (c->flags, CLIENT_FLAG_ABOVE, CLIENT_FLAG_BELOW))
{
- TRACE ("Applying client's initial state: above");
+ TRACE ("applying client's initial state: above");
clientUpdateLayerState (c);
}
if (FLAG_TEST_AND_NOT (c->flags, CLIENT_FLAG_BELOW, CLIENT_FLAG_ABOVE))
{
- TRACE ("Applying client's initial state: below");
+ TRACE ("applying client's initial state: below");
clientUpdateLayerState (c);
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_STICKY) &&
FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_STICK))
{
- TRACE ("Applying client's initial state: sticky");
+ TRACE ("applying client's initial state: sticky");
clientStick (c, TRUE);
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
{
- TRACE ("Applying client's initial state: shaded");
+ TRACE ("applying client's initial state: shaded");
clientShade (c);
}
}
@@ -1466,8 +1454,7 @@ clientUpdateIconPix (Client *c)
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
-
- TRACE ("entering clientUpdateIconPix for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
for (i = 0; i < STATE_TOGGLED; i++)
@@ -1512,11 +1499,10 @@ static gboolean
update_icon_idle_cb (gpointer data)
{
Client *c;
-
- TRACE ("entering update_icon_idle_cb");
-
+
c = (Client *) data;
g_return_val_if_fail (c, FALSE);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
clientUpdateIconPix (c);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_VISIBLE))
@@ -1532,8 +1518,7 @@ void
clientUpdateIcon (Client *c)
{
g_return_if_fail (c);
-
- TRACE ("entering clientUpdateIcon for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (c->icon_timeout_id == 0)
{
@@ -1589,9 +1574,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
g_return_val_if_fail (w != None, NULL);
g_return_val_if_fail (display_info != NULL, NULL);
-
- TRACE ("entering clientFrame");
- TRACE ("framing client (0x%lx)", w);
+ TRACE ("window 0x%lx", w);
myDisplayGrabServer (display_info);
@@ -1612,7 +1595,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
if (w == screen_info->xfwm4_win)
{
- TRACE ("Not managing our own event window");
+ TRACE ("not managing our own event window");
compositorAddWindow (display_info, w, NULL);
myDisplayUngrabServer (display_info);
return NULL;
@@ -1621,20 +1604,20 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
#ifdef ENABLE_KDE_SYSTRAY_PROXY
if (checkKdeSystrayWindow (display_info, w))
{
- TRACE ("Detected KDE systray windows");
+ TRACE ("detected KDE systray windows");
if (screen_info->systray != None)
{
sendSystrayReqDock (display_info, w, screen_info->systray);
myDisplayUngrabServer (display_info);
return NULL;
}
- TRACE ("No systray found for this screen");
+ TRACE ("no systray found for this screen");
}
#endif /* ENABLE_KDE_SYSTRAY_PROXY */
if (attr.override_redirect)
{
- TRACE ("Override redirect window 0x%lx", w);
+ TRACE ("override redirect window 0x%lx", w);
compositorAddWindow (display_info, w, NULL);
myDisplayUngrabServer (display_info);
return NULL;
@@ -1643,7 +1626,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
c = g_new0 (Client, 1);
if (!c)
{
- TRACE ("Cannot allocate memory for the window structure");
+ TRACE ("cannot allocate memory for the window structure");
myDisplayUngrabServer (display_info);
return NULL;
}
@@ -1790,7 +1773,7 @@ clientFrame (DisplayInfo *display_info, Window w, gboolean recapture)
/*client PID */
getHint (display_info, c->window, NET_WM_PID, (long *) &pid);
c->pid = (GPid) pid;
- TRACE ("Client \"%s\" (0x%lx) PID = %i", c->name, c->window, c->pid);
+ TRACE ("client \"%s\" (0x%lx) PID = %i", c->name, c->window, c->pid);
/* Apply startup notification properties if available */
sn_client_startup_properties (c);
@@ -2033,8 +2016,7 @@ clientUnframe (Client *c, gboolean remap)
int i;
gboolean reparented;
- TRACE ("entering clientUnframe");
- TRACE ("unframing client \"%s\" (0x%lx) [%s]",
+ TRACE ("client \"%s\" (0x%lx) [%s]",
c->name, c->window, remap ? "remap" : "no remap");
g_return_if_fail (c != NULL);
@@ -2118,7 +2100,7 @@ clientFrameAll (ScreenInfo *screen_info)
Window w1, w2, *wins;
unsigned int count, i;
- TRACE ("entering clientFrameAll");
+ TRACE ("entering");
display_info = screen_info->display_info;
clientSetFocus (screen_info, NULL, myDisplayGetCurrentTime (display_info), NO_FOCUS_FLAG);
@@ -2169,7 +2151,7 @@ clientUnframeAll (ScreenInfo *screen_info)
Window w1, w2, *wins;
unsigned int count, i;
- TRACE ("entering clientUnframeAll");
+ TRACE ("entering");
display_info = screen_info->display_info;
clientSetFocus (screen_info, NULL, myDisplayGetCurrentTime (display_info), FOCUS_IGNORE_MODAL);
@@ -2199,7 +2181,7 @@ clientGetFromWindow (Client *c, Window w, unsigned short mode)
g_return_val_if_fail (w != None, NULL);
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering clientGetFromWindow");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (mode & SEARCH_WINDOW)
{
@@ -2252,8 +2234,7 @@ clientSetWorkspaceSingle (Client *c, guint ws)
DisplayInfo *display_info;
g_return_if_fail (c != NULL);
-
- TRACE ("entering clientSetWorkspaceSingle");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -2289,8 +2270,7 @@ clientSetWorkspace (Client *c, guint ws, gboolean manage_mapping)
guint previous_ws;
g_return_if_fail (c != NULL);
-
- TRACE ("entering clientSetWorkspace");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (ws > c->screen_info->workspace_count - 1)
{
@@ -2372,7 +2352,7 @@ clientShow (Client *c, gboolean deiconify)
GList *list;
g_return_if_fail (c != NULL);
- TRACE ("entering clientShow \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
list_of_windows = clientListTransientOrModal (c);
for (list = g_list_last (list_of_windows); list; list = g_list_previous (list))
@@ -2399,11 +2379,11 @@ clientWithdrawSingle (Client *c, GList *exclude_list, gboolean iconify)
DisplayInfo *display_info;
g_return_if_fail (c != NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
- TRACE ("hiding client \"%s\" (0x%lx)", c->name, c->window);
clientPassFocus(c->screen_info, c, exclude_list);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_VISIBLE))
{
@@ -2435,7 +2415,7 @@ clientWithdraw (Client *c, guint ws, gboolean iconify)
GList *list;
g_return_if_fail (c != NULL);
- TRACE ("entering clientWithdraw \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
list_of_windows = clientListTransientOrModal (c);
for (list = list_of_windows; list; list = g_list_next (list))
@@ -2490,8 +2470,7 @@ clientWithdrawAll (Client *c, guint ws)
ScreenInfo *screen_info;
g_return_if_fail (c != NULL);
-
- TRACE ("entering clientWithdrawAll");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
for (list = screen_info->windows_stack; list; list = g_list_next (list))
@@ -2517,7 +2496,7 @@ clientClearAllShowDesktop (ScreenInfo *screen_info)
{
GList *list;
- TRACE ("entering clientClearShowDesktop");
+ TRACE ("entering");
if (screen_info->show_desktop)
{
@@ -2537,7 +2516,7 @@ clientToggleShowDesktop (ScreenInfo *screen_info)
{
GList *list;
- TRACE ("entering clientToggleShowDesktop");
+ TRACE ("entering");
clientSetFocus (screen_info, NULL,
myDisplayGetCurrentTime (screen_info->display_info),
@@ -2579,7 +2558,7 @@ clientActivate (Client *c, guint32 timestamp, gboolean source_is_application)
Client *ancestor;
g_return_if_fail (c != NULL);
- TRACE ("entering clientActivate \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
ancestor = clientGetTransientFor(c);
@@ -2630,7 +2609,7 @@ clientActivate (Client *c, guint32 timestamp, gboolean source_is_application)
}
else
{
- TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
clientSetNetState (c);
}
@@ -2644,9 +2623,7 @@ clientClose (Client *c)
guint32 timestamp;
g_return_if_fail (c != NULL);
-
- TRACE ("entering clientClose");
- TRACE ("closing client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -2671,8 +2648,7 @@ void
clientKill (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientKill");
- TRACE ("killing client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
XKillClient (clientGetXDisplay (c), c->window);
}
@@ -2684,7 +2660,7 @@ clientTerminate (Client *c)
DisplayInfo *display_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientTerminate");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -2693,7 +2669,7 @@ clientTerminate (Client *c)
{
if (!strcmp (display_info->hostname, c->hostname))
{
- TRACE ("Sending client %s (pid %i) signal SIGKILL\n", c->name, c->pid);
+ TRACE ("sending client %s (pid %i) signal SIGKILL\n", c->name, c->pid);
if (kill (c->pid, SIGKILL) < 0)
{
@@ -2712,9 +2688,7 @@ clientEnterContextMenuState (Client *c)
DisplayInfo *display_info;
g_return_if_fail (c != NULL);
-
- TRACE ("entering clientEnterContextMenuState");
- TRACE ("Showing the what's this help for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -2734,7 +2708,7 @@ clientSetLayer (Client *c, guint l)
Client *c2 = NULL;
g_return_if_fail (c != NULL);
- TRACE ("entering clientSetLayer for \"%s\" (0x%lx) on layer %d", c->name, c->window, l);
+ TRACE ("client \"%s\" (0x%lx) on layer %d", c->name, c->window, l);
list_of_windows = clientListTransientOrModal (c);
for (list = list_of_windows; list; list = g_list_next (list))
@@ -2757,12 +2731,12 @@ clientSetLayer (Client *c, guint l)
c2 = clientGetFocusOrPending ();
if (c2 && (c2 != c) && (c2->win_layer == c->win_layer))
{
- TRACE ("Placing %s under %s", c->name, c2->name);
+ TRACE ("placing %s under %s", c->name, c2->name);
clientLower (c, c2->frame);
}
else
{
- TRACE ("Placing %s on top of its layer %lu", c->name, c->win_layer);
+ TRACE ("placing %s on top of its layer %lu", c->name, c->win_layer);
clientRaise (c, None);
}
}
@@ -2776,8 +2750,7 @@ clientShade (Client *c)
unsigned long mask;
g_return_if_fail (c != NULL);
- TRACE ("entering clientToggleShaded");
- TRACE ("shading client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!CLIENT_HAS_FRAME(c))
{
@@ -2786,7 +2759,7 @@ clientShade (Client *c)
}
else if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
{
- TRACE ("\"%s\" (0x%lx) is already shaded", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx) is already shaded", c->name, c->window);
return;
}
@@ -2834,8 +2807,7 @@ clientUnshade (Client *c)
DisplayInfo *display_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientToggleShaded");
- TRACE ("shading/unshading client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
{
@@ -2891,7 +2863,7 @@ clientStick (Client *c, gboolean include_transients)
GList *list;
g_return_if_fail (c != NULL);
- TRACE ("entering clientStick");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -2902,7 +2874,7 @@ clientStick (Client *c, gboolean include_transients)
for (list = list_of_windows; list; list = g_list_next (list))
{
c2 = (Client *) list->data;
- TRACE ("Sticking client \"%s\" (0x%lx)", c2->name, c2->window);
+ TRACE ("sticking client \"%s\" (0x%lx)", c2->name, c2->window);
FLAG_SET (c2->flags, CLIENT_FLAG_STICKY);
setHint (display_info, c2->window, NET_WM_DESKTOP, (unsigned long) ALL_WORKSPACES);
frameQueueDraw (c2, FALSE);
@@ -2911,7 +2883,7 @@ clientStick (Client *c, gboolean include_transients)
}
else
{
- TRACE ("Sticking client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("sticking client \"%s\" (0x%lx)", c->name, c->window);
FLAG_SET (c->flags, CLIENT_FLAG_STICKY);
setHint (display_info, c->window, NET_WM_DESKTOP, (unsigned long) ALL_WORKSPACES);
}
@@ -2929,7 +2901,7 @@ clientUnstick (Client *c, gboolean include_transients)
GList *list;
g_return_if_fail (c != NULL);
- TRACE ("entering clientUnstick");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -2940,7 +2912,7 @@ clientUnstick (Client *c, gboolean include_transients)
for (list = list_of_windows; list; list = g_list_next (list))
{
c2 = (Client *) list->data;
- TRACE ("Unsticking client \"%s\" (0x%lx)", c2->name, c2->window);
+ TRACE ("unsticking client \"%s\" (0x%lx)", c2->name, c2->window);
FLAG_UNSET (c2->flags, CLIENT_FLAG_STICKY);
setHint (display_info, c2->window, NET_WM_DESKTOP, (unsigned long) screen_info->current_ws);
frameQueueDraw (c2, FALSE);
@@ -2949,7 +2921,7 @@ clientUnstick (Client *c, gboolean include_transients)
}
else
{
- TRACE ("Unsticking client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("unsticking client \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->flags, CLIENT_FLAG_STICKY);
setHint (display_info, c->window, NET_WM_DESKTOP, (unsigned long) screen_info->current_ws);
}
@@ -2961,8 +2933,7 @@ void
clientToggleSticky (Client *c, gboolean include_transients)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientToggleSticky");
- TRACE ("sticking/unsticking client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
{
@@ -2983,8 +2954,7 @@ clientUpdateFullscreenSize (Client *c)
int i;
g_return_if_fail (c != NULL);
- TRACE ("entering clientUpdateFullscreenSize");
- TRACE ("Update fullscreen size for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -3039,8 +3009,7 @@ clientUpdateFullscreenSize (Client *c)
void clientToggleFullscreen (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientToggleFullscreen");
- TRACE ("toggle fullscreen client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
/*can we switch to full screen, does it make any sense? */
if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN) && (c->size->flags & PMaxSize))
@@ -3073,7 +3042,7 @@ void clientSetFullscreenMonitor (Client *c, gint top, gint bottom, gint left, gi
gint num_monitors;
g_return_if_fail (c != NULL);
- TRACE ("entering clientSetFullscreenMonitor");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -3111,7 +3080,7 @@ void clientSetFullscreenMonitor (Client *c, gint top, gint bottom, gint left, gi
void clientToggleLayerAbove (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientToggleAbove");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if ((c->type & WINDOW_REGULAR_FOCUSABLE) &&
!clientIsTransientOrModal (c) &&
@@ -3126,7 +3095,7 @@ void clientToggleLayerAbove (Client *c)
void clientToggleLayerBelow (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientToggleBelow");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if ((c->type & WINDOW_REGULAR_FOCUSABLE) &&
!clientIsTransientOrModal (c) &&
@@ -3141,7 +3110,7 @@ void clientToggleLayerBelow (Client *c)
void clientSetLayerNormal (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientSetLayerNormal");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
{
@@ -3154,8 +3123,7 @@ void
clientUpdateMaximizeSize (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientUpdateMaximizeSize");
- TRACE ("Update maximized size for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
/* Recompute size and position of maximized windows */
if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED))
@@ -3169,9 +3137,7 @@ void
clientRemoveMaximizeFlag (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientRemoveMaximizeFlag");
- TRACE ("Removing maximize flag on client \"%s\" (0x%lx)", c->name,
- c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->flags, CLIENT_FLAG_MAXIMIZED | CLIENT_FLAG_RESTORE_SIZE_POS);
frameQueueDraw (c, FALSE);
@@ -3364,8 +3330,7 @@ gboolean
clientToggleMaximized (Client *c, int mode, gboolean restore_position)
{
g_return_val_if_fail (c != NULL, FALSE);
-
- TRACE ("entering clientToggleMaximized");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!CLIENT_CAN_MAXIMIZE_WINDOW (c))
{
@@ -3388,9 +3353,7 @@ clientToggleMaximizedAtPoint (Client *c, gint cx, gint cy, int mode, gboolean re
unsigned long old_flags;
g_return_val_if_fail (c != NULL, FALSE);
-
- TRACE ("entering clientToggleMaximizedAtPoint");
- TRACE ("maximizing/unmaximizing client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!CLIENT_CAN_MAXIMIZE_WINDOW (c))
{
@@ -3468,9 +3431,7 @@ clientTile (Client *c, gint cx, gint cy, tilePositionType tile, gboolean send_co
unsigned long old_flags;
g_return_val_if_fail (c != NULL, FALSE);
-
- TRACE ("entering clientTile");
- TRACE ("Tiling client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!CLIENT_CAN_TILE_WINDOW (c))
{
@@ -3872,7 +3833,7 @@ clientButtonPress (Client *c, Window w, XfwmEventButton *event)
gboolean g1;
g_return_if_fail (c != NULL);
- TRACE ("entering clientButtonPress");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
for (b = 0; b < BUTTON_COUNT; b++)
{
@@ -3977,7 +3938,7 @@ clientGetButtonPixmap (Client *c, int button, int state)
{
ScreenInfo *screen_info;
- TRACE ("entering clientGetButtonPixmap button=%i, state=%i", button, state);
+ TRACE ("button=%i, state=%i", button, state);
screen_info = c->screen_info;
switch (button)
{
@@ -4045,8 +4006,8 @@ clientGetButtonState (Client *c, int button, int state)
Client *
clientGetLeader (Client *c)
{
- TRACE ("entering clientGetLeader");
g_return_val_if_fail (c != NULL, NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (c->group_leader != None)
{
@@ -4069,7 +4030,7 @@ clientGetGtkFrameExtents (Client * c)
int i;
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientGetGtkFrameExtents for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -4104,7 +4065,7 @@ clientGetGtkHideTitlebar (Client * c)
long val;
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientGetGtkHideTitlebar for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
diff --git a/src/compositor.c b/src/compositor.c
index 91cb9f1..52b7a2d 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -152,7 +152,7 @@ find_cwindow_in_screen (ScreenInfo *screen_info, Window id)
g_return_val_if_fail (id != None, NULL);
g_return_val_if_fail (screen_info != NULL, NULL);
- TRACE ("entering find_cwindow_in_screen");
+ TRACE ("window 0x%lx", id);
for (list = screen_info->cwindows; list; list = g_list_next (list))
{
@@ -172,7 +172,7 @@ find_cwindow_in_display (DisplayInfo *display_info, Window id)
g_return_val_if_fail (id != None, NULL);
g_return_val_if_fail (display_info != NULL, NULL);
- TRACE ("entering find_cwindow_in_display");
+ TRACE ("window 0x%lx", id);
for (list = display_info->screens; list; list = g_slist_next (list))
{
@@ -193,7 +193,7 @@ is_output (DisplayInfo *display_info, Window id)
g_return_val_if_fail (id != None, FALSE);
g_return_val_if_fail (display_info != NULL, FALSE);
- TRACE ("entering is_output");
+ TRACE ("window 0x%lx", id);
for (list = display_info->screens; list; list = g_slist_next (list))
{
@@ -267,7 +267,7 @@ make_gaussian_map (gdouble r)
gdouble t;
gdouble g;
- TRACE ("entering make_gaussian_map");
+ TRACE ("entering");
size = ((gint) ceil ((r * 3)) + 1) & ~1;
center = size / 2;
@@ -325,7 +325,7 @@ sum_gaussian (gaussian_conv *map, gdouble opacity, gint x, gint y, gint width, g
gint g_size, center;
g_return_val_if_fail (map != NULL, (guchar) 255.0);
- TRACE ("entering sum_gaussian");
+ TRACE ("(%i,%i) [%i×%i]", x, y, width, height);
g_line = map->data;
g_size = map->size;
@@ -382,7 +382,7 @@ presum_gaussian (ScreenInfo *screen_info)
g_return_if_fail (screen_info != NULL);
g_return_if_fail (screen_info->gaussianMap != NULL);
- TRACE ("entering presum_gaussian");
+ TRACE ("entering");
map = screen_info->gaussianMap;
screen_info->gaussianSize = map->size;
@@ -465,7 +465,7 @@ make_shadow (ScreenInfo *screen_info, gdouble opacity, gint width, gint height)
gint y_swidth;
g_return_val_if_fail (screen_info != NULL, NULL);
- TRACE ("entering make_shadow");
+ TRACE ("entering");
display_info = screen_info->display_info;
gaussianSize = screen_info->gaussianMap->size;
@@ -603,7 +603,7 @@ shadow_picture (ScreenInfo *screen_info, gdouble opacity,
GC gc;
g_return_val_if_fail (screen_info != NULL, None);
- TRACE ("entering shadow_picture");
+ TRACE ("entering");
display_info = screen_info->display_info;
render_format = XRenderFindStandardFormat (display_info->dpy, PictStandardA8);
@@ -662,7 +662,7 @@ solid_picture (ScreenInfo *screen_info, gboolean argb,
XRenderColor c;
g_return_val_if_fail (screen_info, None);
- TRACE ("entering solid_picture");
+ TRACE ("entering");
display_info = screen_info->display_info;
render_format = XRenderFindStandardFormat (display_info->dpy,
@@ -703,7 +703,7 @@ client_size (CWindow *cw)
XserverRegion border;
g_return_val_if_fail (cw != NULL, None);
- TRACE ("entering client_size");
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -733,7 +733,7 @@ border_size (CWindow *cw)
XserverRegion border;
g_return_val_if_fail (cw != NULL, None);
- TRACE ("entering border_size");
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -870,7 +870,7 @@ root_tile (ScreenInfo *screen_info)
#endif
g_return_val_if_fail (screen_info != NULL, None);
- TRACE ("entering root_tile");
+ TRACE ("entering");
display_info = screen_info->display_info;
dpy = display_info->dpy;
@@ -939,7 +939,7 @@ create_root_buffer (ScreenInfo *screen_info, Pixmap pixmap)
g_return_val_if_fail (screen_info != NULL, None);
g_return_val_if_fail (pixmap != None, None);
- TRACE ("entering create_root_buffer");
+ TRACE ("entering");
display_info = screen_info->display_info;
format = XRenderFindVisualFormat (display_info->dpy, screen_info->visual);
@@ -964,7 +964,7 @@ cursor_to_picture (ScreenInfo *screen_info, XFixesCursorImage *cursor)
gint i;
g_return_val_if_fail (screen_info != NULL, None);
- TRACE ("entering cursor_to_picture");
+ TRACE ("entering");
display_info = screen_info->display_info;
@@ -1061,8 +1061,7 @@ check_glx_renderer (ScreenInfo *screen_info)
int i;
g_return_val_if_fail (screen_info != NULL, FALSE);
-
- TRACE ("entering check_glx_renderer");
+ TRACE ("entering");
glRenderer = (const char *) glGetString (GL_RENDERER);
if (glRenderer == NULL)
@@ -1128,8 +1127,7 @@ choose_glx_settings (ScreenInfo *screen_info)
VisualID xvisual_id;
g_return_val_if_fail (screen_info != NULL, FALSE);
-
- TRACE ("entering choose_glx_settings");
+ TRACE ("entering");
configs = glXChooseFBConfig (myScreenGetXDisplay (screen_info),
screen_info->screen,
@@ -1285,8 +1283,7 @@ init_glx (ScreenInfo *screen_info)
int version;
g_return_val_if_fail (screen_info != NULL, FALSE);
-
- TRACE ("entering init_glx");
+ TRACE ("entering");
if (!glXQueryExtension (myScreenGetXDisplay (screen_info), &error_base, &event_base))
{
@@ -1379,8 +1376,7 @@ create_glx_drawable (ScreenInfo *screen_info, Pixmap pixmap)
g_return_val_if_fail (screen_info != NULL, None);
g_return_val_if_fail (pixmap != None, None);
-
- TRACE ("entering create_glx_drawable");
+ TRACE ("entering");
pixmap_attribs[1] = screen_info->texture_target;
pixmap_attribs[3] = screen_info->texture_format;
@@ -1389,7 +1385,7 @@ create_glx_drawable (ScreenInfo *screen_info, Pixmap pixmap)
screen_info->glx_fbconfig,
pixmap, pixmap_attribs);
check_gl_error();
- TRACE ("Created GLX pixmap 0x%lx from Pixmap 0x%lx", glx_drawable, pixmap);
+ TRACE ("created GLX pixmap 0x%lx from Pixmap 0x%lx", glx_drawable, pixmap);
return glx_drawable;
}
@@ -1398,8 +1394,7 @@ static void
enable_glx_texture (ScreenInfo *screen_info)
{
g_return_if_fail (screen_info != NULL);
-
- TRACE ("entering enable_glx_texture");
+ TRACE ("entering");
glBindTexture(screen_info->texture_type, screen_info->rootTexture);
glEnable(screen_info->texture_type);
@@ -1410,8 +1405,7 @@ static void
disable_glx_texture (ScreenInfo *screen_info)
{
g_return_if_fail (screen_info != NULL);
-
- TRACE ("entering disable_glx_texture");
+ TRACE ("entering");
glBindTexture(screen_info->texture_type, None);
glDisable(screen_info->texture_type);
@@ -1421,12 +1415,11 @@ static void
unbind_glx_texture (ScreenInfo *screen_info)
{
g_return_if_fail (screen_info != NULL);
-
- TRACE ("entering unbind_glx_texture");
+ TRACE ("entering");
if (screen_info->glx_drawable)
{
- TRACE ("Unbinding GLX drawable 0x%lx", screen_info->glx_drawable);
+ TRACE ("unbinding GLX drawable 0x%lx", screen_info->glx_drawable);
glXReleaseTexImageEXT (myScreenGetXDisplay (screen_info),
screen_info->glx_drawable, GLX_FRONT_EXT);
glXDestroyPixmap(myScreenGetXDisplay (screen_info), screen_info->glx_drawable);
@@ -1447,20 +1440,19 @@ bind_glx_texture (ScreenInfo *screen_info, Pixmap pixmap)
{
g_return_if_fail (screen_info != NULL);
g_return_if_fail (pixmap != None);
-
- TRACE ("entering bind_glx_texture");
+ TRACE ("entering");
if (screen_info->rootTexture == None)
{
glGenTextures(1, &screen_info->rootTexture);
- TRACE ("Generated texture 0x%x", screen_info->rootTexture);
+ TRACE ("generated texture 0x%x", screen_info->rootTexture);
}
if (screen_info->glx_drawable == None)
{
screen_info->glx_drawable = create_glx_drawable (screen_info, pixmap);
}
- TRACE ("(Re)Binding GLX pixmap 0x%lx to texture 0x%x",
+ TRACE ("(re)Binding GLX pixmap 0x%lx to texture 0x%x",
screen_info->glx_drawable, screen_info->rootTexture);
enable_glx_texture (screen_info);
glXBindTexImageEXT (myScreenGetXDisplay (screen_info),
@@ -1492,9 +1484,7 @@ static void
redraw_glx_texture (ScreenInfo *screen_info)
{
g_return_if_fail (screen_info != NULL);
-
- TRACE ("entering redraw_glx_texture");
- TRACE ("(Re)Drawing GLX pixmap 0x%lx/texture 0x%x",
+ TRACE ("(re)Drawing GLX pixmap 0x%lx/texture 0x%x",
screen_info->glx_drawable, screen_info->rootTexture);
glMatrixMode(GL_TEXTURE);
@@ -1539,7 +1529,7 @@ redraw_glx_texture (ScreenInfo *screen_info)
disable_glx_texture (screen_info);
- TRACE ("Releasing bind GLX pixmap 0x%lx to texture 0x%x",
+ TRACE ("releasing bind GLX pixmap 0x%lx to texture 0x%x",
screen_info->glx_drawable, screen_info->rootTexture);
glXReleaseTexImageEXT (myScreenGetXDisplay (screen_info),
screen_info->glx_drawable, GLX_FRONT_EXT);
@@ -1591,8 +1581,7 @@ present_flip (ScreenInfo *screen_info, XserverRegion region, Pixmap pixmap)
g_return_if_fail (screen_info != NULL);
g_return_if_fail (region != None);
g_return_if_fail (pixmap != None);
-
- TRACE ("entering present_flip (serial %d)", present_serial);
+ TRACE ("serial %d", present_serial);
XPresentPixmap (myScreenGetXDisplay (screen_info), screen_info->output,
pixmap, present_serial++, None, region, 0, 0, None, None, None,
@@ -1608,7 +1597,7 @@ win_extents (CWindow *cw)
XRectangle r;
g_return_val_if_fail (cw != NULL, None);
- TRACE ("entering win_extents: 0x%lx", cw->id);
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -1695,7 +1684,8 @@ win_extents (CWindow *cw)
static void
get_paint_bounds (CWindow *cw, gint *x, gint *y, guint *w, guint *h)
{
- TRACE ("entering get_paint_bounds");
+ g_return_if_fail (cw != NULL);
+ TRACE ("window 0x%lx", cw->id);
#if HAVE_NAME_WINDOW_PIXMAP
*x = cw->attr.x;
@@ -1718,7 +1708,7 @@ get_window_format (CWindow *cw)
XRenderPictFormat *format;
g_return_val_if_fail (cw != NULL, NULL);
- TRACE ("entering get_window_format");
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -1743,7 +1733,7 @@ get_window_picture (CWindow *cw)
Drawable draw;
g_return_val_if_fail (cw != NULL, None);
- TRACE ("entering get_window_picture");
+ TRACE ("window 0x%lx", cw->id);
draw = cw->id;
screen_info = cw->screen_info;
@@ -1776,7 +1766,7 @@ unredirect_win (CWindow *cw)
DisplayInfo *display_info;
g_return_if_fail (cw != NULL);
- TRACE ("entering unredirect_win");
+ TRACE ("window 0x%lx", cw->id);
if (WIN_IS_REDIRECTED(cw))
{
@@ -1787,7 +1777,7 @@ unredirect_win (CWindow *cw)
cw->redirected = FALSE;
XCompositeUnredirectWindow (display_info->dpy, cw->id, display_info->composite_mode);
- TRACE ("Window 0x%lx unredirected, wins_unredirected is %i", cw->id, screen_info->wins_unredirected);
+ TRACE ("window 0x%lx unredirected, wins_unredirected is %i", cw->id, screen_info->wins_unredirected);
}
}
@@ -1796,8 +1786,8 @@ paint_root (ScreenInfo *screen_info, Picture paint_buffer)
{
g_return_if_fail (screen_info != NULL);
g_return_if_fail (paint_buffer != None);
+ TRACE ("entering");
- TRACE ("entering paint_root");
if (screen_info->rootTile == None)
{
screen_info->rootTile = root_tile (screen_info);
@@ -1837,7 +1827,7 @@ paint_win (CWindow *cw, XserverRegion region, Picture paint_buffer, gboolean sol
gboolean paint_solid;
g_return_if_fail (cw != NULL);
- TRACE ("entering paint_win: 0x%lx", cw->id);
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -1975,7 +1965,7 @@ paint_all (ScreenInfo *screen_info, XserverRegion region, gushort buffer)
gint screen_height;
CWindow *cw;
- TRACE ("entering paint_all buffer %d", buffer);
+ TRACE ("buffer %d", buffer);
g_return_if_fail (screen_info);
display_info = screen_info->display_info;
@@ -2138,7 +2128,7 @@ paint_all (ScreenInfo *screen_info, XserverRegion region, gushort buffer)
}
}
- TRACE ("Copying data back to screen");
+ TRACE ("copying data back to screen");
#ifdef HAVE_EPOXY
if (screen_info->use_glx)
{
@@ -2233,7 +2223,7 @@ repair_screen (ScreenInfo *screen_info)
DisplayInfo *display_info;
g_return_val_if_fail (screen_info, FALSE);
- TRACE ("entering repair_screen");
+ TRACE ("entering");
if (!screen_info->compositor_active)
{
@@ -2328,7 +2318,7 @@ repair_display (DisplayInfo *display_info)
GSList *screens;
g_return_if_fail (display_info);
- TRACE ("entering repair_display");
+ TRACE ("entering");
for (screens = display_info->screens; screens; screens = g_slist_next (screens))
{
@@ -2342,7 +2332,7 @@ add_damage (ScreenInfo *screen_info, XserverRegion damage)
{
DisplayInfo *display_info;
- TRACE ("entering add_damage");
+ TRACE ("entering");
if (damage == None)
{
@@ -2426,7 +2416,7 @@ repair_win (CWindow *cw, XRectangle *r)
g_return_if_fail (cw != NULL);
- TRACE ("entering repair_win");
+ TRACE ("entering");
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -2484,7 +2474,7 @@ damage_win (CWindow *cw)
XserverRegion extents;
g_return_if_fail (cw != NULL);
- TRACE ("entering damage_win");
+ TRACE ("window 0x%lx", cw->id);
extents = win_extents (cw);
fix_region (cw, extents);
@@ -2499,7 +2489,7 @@ update_extents (CWindow *cw)
ScreenInfo *screen_info;
g_return_if_fail (cw != NULL);
- TRACE ("entering update_extents");
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -2523,7 +2513,9 @@ determine_mode (CWindow *cw)
ScreenInfo *screen_info;
XRenderPictFormat *format;
- TRACE ("entering determine_mode");
+ g_return_if_fail (cw != NULL);
+ TRACE ("window 0x%lx", cw->id);
+
screen_info = cw->screen_info;
display_info = screen_info->display_info;
format = NULL;
@@ -2568,7 +2560,7 @@ expose_area (ScreenInfo *screen_info, XRectangle *rects, gint nrects)
g_return_if_fail (rects != NULL);
g_return_if_fail (nrects > 0);
- TRACE ("entering expose_area");
+ TRACE ("entering");
display_info = screen_info->display_info;
region = XFixesCreateRegion (display_info->dpy, rects, nrects);
@@ -2583,7 +2575,7 @@ set_win_opacity (CWindow *cw, guint32 opacity)
ScreenInfo *screen_info;
g_return_if_fail (cw != NULL);
- TRACE ("entering set_win_opacity");
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -2610,7 +2602,7 @@ map_win (CWindow *cw)
DisplayInfo *display_info;
g_return_if_fail (cw != NULL);
- TRACE ("entering map_win 0x%lx", cw->id);
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -2627,13 +2619,13 @@ map_win (CWindow *cw)
* a black screen until the tooltip is unmapped...
*/
screen_info->wins_unredirected++;
- TRACE ("Mapping fullscreen window 0x%lx, wins_unredirected increased to %i", cw->id, screen_info->wins_unredirected);
+ TRACE ("mapping fullscreen window 0x%lx, wins_unredirected increased to %i", cw->id, screen_info->wins_unredirected);
}
- TRACE ("Mapping unredirected window 0x%lx, wins_unredirected is now %i", cw->id, screen_info->wins_unredirected);
+ TRACE ("mapping unredirected window 0x%lx, wins_unredirected is now %i", cw->id, screen_info->wins_unredirected);
#if HAVE_OVERLAYS
if ((screen_info->wins_unredirected == 1) && (display_info->have_overlays))
{
- TRACE ("Unmapping overlay window");
+ TRACE ("unmapping overlay window");
XUnmapWindow (myScreenGetXDisplay (screen_info), screen_info->overlay);
}
#endif /* HAVE_OVERLAYS */
@@ -2652,7 +2644,7 @@ map_win (CWindow *cw)
cw->opacity = NET_WM_OPAQUE;
if (screen_info->params->unredirect_overlays)
{
- TRACE ("Unredirecting toplevel window 0x%lx", cw->id);
+ TRACE ("unredirecting toplevel window 0x%lx", cw->id);
unredirect_win (cw);
}
}
@@ -2665,7 +2657,7 @@ unmap_win (CWindow *cw)
DisplayInfo *display_info;
g_return_if_fail (cw != NULL);
- TRACE ("entering unmap_win 0x%lx", cw->id);
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -2675,16 +2667,16 @@ unmap_win (CWindow *cw)
if (cw->fulloverlay)
{
screen_info->wins_unredirected--;
- TRACE ("Unmapping fullscreen window 0x%lx, wins_unredirected decreased to %i", cw->id, screen_info->wins_unredirected);
+ TRACE ("unmapping fullscreen window 0x%lx, wins_unredirected decreased to %i", cw->id, screen_info->wins_unredirected);
}
- TRACE ("Unmapped window 0x%lx, wins_unredirected is now %i", cw->id, screen_info->wins_unredirected);
+ TRACE ("unmapped window 0x%lx, wins_unredirected is now %i", cw->id, screen_info->wins_unredirected);
if (!screen_info->wins_unredirected)
{
/* Restore the overlay if that was the last unredirected window */
#if HAVE_OVERLAYS
if (display_info->have_overlays)
{
- TRACE ("Remapping overlay window");
+ TRACE ("remapping overlay window");
XMapWindow (myScreenGetXDisplay (screen_info), screen_info->overlay);
}
#endif /* HAVE_OVERLAYS */
@@ -2711,8 +2703,8 @@ init_opacity (CWindow *cw)
DisplayInfo *display_info;
Client *c;
- TRACE ("init_opacity");
g_return_if_fail (cw != NULL);
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -2744,18 +2736,18 @@ add_win (DisplayInfo *display_info, Window id, Client *c)
ScreenInfo *screen_info;
CWindow *new;
- TRACE ("entering add_win: 0x%lx", id);
+ TRACE ("window 0x%lx", id);
if (is_output (display_info, id))
{
- TRACE ("Not adding output window 0x%lx", id);
+ TRACE ("not adding output window 0x%lx", id);
return;
}
new = find_cwindow_in_display (display_info, id);
if (new)
{
- TRACE ("Window 0x%lx already added", id);
+ TRACE ("window 0x%lx already added", id);
return;
}
@@ -2765,7 +2757,7 @@ add_win (DisplayInfo *display_info, Window id, Client *c)
{
g_free (new);
myDisplayUngrabServer (display_info);
- TRACE ("An error occurred getting window attributes, 0x%lx not added", id);
+ TRACE ("an error occurred getting window attributes, 0x%lx not added", id);
return;
}
@@ -2782,7 +2774,7 @@ add_win (DisplayInfo *display_info, Window id, Client *c)
{
g_free (new);
myDisplayUngrabServer (display_info);
- TRACE ("Couldn't get screen from window, 0x%lx not added", id);
+ TRACE ("couldn't get screen from window, 0x%lx not added", id);
return;
}
@@ -2790,7 +2782,7 @@ add_win (DisplayInfo *display_info, Window id, Client *c)
{
g_free (new);
myDisplayUngrabServer (display_info);
- TRACE ("Compositor not active on screen %i, 0x%lx not added", screen_info->screen, id);
+ TRACE ("compositor not active on screen %i, 0x%lx not added", screen_info->screen, id);
return;
}
@@ -2866,7 +2858,7 @@ restack_win (CWindow *cw, Window above)
GList *next;
g_return_if_fail (cw != NULL);
- TRACE ("entering restack_win, 0x%lx above 0x%lx", cw->id, above);
+ TRACE ("window 0x%lx above 0x%lx", cw->id, above);
screen_info = cw->screen_info;
sibling = g_list_find (screen_info->cwindows, (gconstpointer) cw);
@@ -2917,8 +2909,7 @@ resize_win (CWindow *cw, gint x, gint y, gint width, gint height, gint bw)
XserverRegion damage;
g_return_if_fail (cw != NULL);
- TRACE ("entering resize_win");
- TRACE ("resizing 0x%lx, (%i,%i) %ix%i", cw->id, x, y, width, height);
+ TRACE ("window 0x%lx, (%i,%i) %ix%i", cw->id, x, y, width, height);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -3008,7 +2999,7 @@ reshape_win (CWindow *cw)
XserverRegion damage;
g_return_if_fail (cw != NULL);
- TRACE ("entering reshape_win");
+ TRACE ("window 0x%lx", cw->id);
screen_info = cw->screen_info;
display_info = screen_info->display_info;
@@ -3070,7 +3061,7 @@ destroy_win (DisplayInfo *display_info, Window id)
g_return_if_fail (display_info != NULL);
g_return_if_fail (id != None);
- TRACE ("entering destroy_win: 0x%lx", id);
+ TRACE ("window 0x%lx", id);
cw = find_cwindow_in_display (display_info, id);
if (cw)
@@ -3094,7 +3085,7 @@ update_cursor(ScreenInfo *screen_info)
XFixesCursorImage *cursor;
g_return_if_fail (screen_info != NULL);
- TRACE ("entering update_cursor");
+ TRACE ("entering");
cursor = XFixesGetCursorImage (screen_info->display_info->dpy);
if (cursor == NULL)
@@ -3215,7 +3206,7 @@ compositorHandleDamage (DisplayInfo *display_info, XDamageNotifyEvent *ev)
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleDamage for 0x%lx", ev->drawable);
+ TRACE ("drawable 0x%lx", ev->drawable);
/*
ev->drawable is the window ID of the damaged window
@@ -3243,7 +3234,7 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev)
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandlePropertyNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
#if MONITOR_ROOT_PIXMAP
backgroundProps[0] = display_info->atoms[XROOTPMAP];
@@ -3271,13 +3262,13 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev)
if (ev->atom == display_info->atoms[NET_WM_WINDOW_OPACITY])
{
CWindow *cw = find_cwindow_in_display (display_info, ev->window);
- TRACE ("Opacity property changed for id 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
if (cw)
{
Client *c = cw->c;
- TRACE ("Opacity changed for 0x%lx", cw->id);
+ TRACE ("opacity changed for 0x%lx", cw->id);
if (!getOpacity (display_info, cw->id, &cw->opacity))
{
/* The property was removed */
@@ -3302,7 +3293,7 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev)
else if (ev->atom == display_info->atoms[NET_WM_WINDOW_OPACITY_LOCKED])
{
CWindow *cw = find_cwindow_in_display (display_info, ev->window);
- TRACE ("Opacity locking property changed for id 0x%lx", ev->window);
+ TRACE ("opacity locking property changed for id 0x%lx", ev->window);
if (cw)
{
@@ -3322,7 +3313,7 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev)
}
else
{
- TRACE ("No compositor property changed for id 0x%lx", ev->window);
+ TRACE ("no compositor property changed for id 0x%lx", ev->window);
}
}
@@ -3335,7 +3326,7 @@ compositorHandleExpose (DisplayInfo *display_info, XExposeEvent *ev)
CWindow *cw;
g_return_if_fail (display_info);
- TRACE ("entering compositorHandleExpose for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
cw = find_cwindow_in_display (display_info, ev->window);
if (cw != NULL)
@@ -3367,7 +3358,7 @@ compositorHandleConfigureNotify (DisplayInfo *display_info, XConfigureEvent *ev)
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleConfigureNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
cw = find_cwindow_in_display (display_info, ev->window);
if (cw)
@@ -3387,7 +3378,7 @@ compositorHandleCirculateNotify (DisplayInfo *display_info, XCirculateEvent *ev)
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleCirculateNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
cw = find_cwindow_in_display (display_info, ev->window);
if (!cw)
@@ -3414,7 +3405,7 @@ compositorHandleCreateNotify (DisplayInfo *display_info, XCreateWindowEvent *ev)
{
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleCreateNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
/*
We are only interested in top level windows, other will
@@ -3435,7 +3426,7 @@ compositorHandleReparentNotify (DisplayInfo *display_info, XReparentEvent *ev)
{
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleReparentNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
if (myDisplayGetScreenFromRoot (display_info, ev->parent) != NULL)
{
@@ -3452,7 +3443,7 @@ compositorHandleDestroyNotify (DisplayInfo *display_info, XDestroyWindowEvent *e
{
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleDestroyNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
destroy_win (display_info, ev->window);
}
@@ -3464,7 +3455,7 @@ compositorHandleMapNotify (DisplayInfo *display_info, XMapEvent *ev)
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleMapNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
cw = find_cwindow_in_display (display_info, ev->window);
if (cw)
@@ -3480,11 +3471,11 @@ compositorHandleUnmapNotify (DisplayInfo *display_info, XUnmapEvent *ev)
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleUnmapNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
if (ev->from_configure)
{
- TRACE ("Ignoring UnmapNotify caused by parent's resize");
+ TRACE ("ignoring UnmapNotify caused by parent's resize");
return;
}
@@ -3505,7 +3496,7 @@ compositorHandleShapeNotify (DisplayInfo *display_info, XShapeEvent *ev)
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleShapeNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
cw = find_cwindow_in_display (display_info, ev->window);
if (cw)
@@ -3532,7 +3523,7 @@ compositorHandleCursorNotify (DisplayInfo *display_info, XFixesCursorNotifyEvent
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleCursorNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
screen_info = myDisplayGetScreenFromRoot (display_info, ev->window);
if (screen_info)
@@ -3577,7 +3568,7 @@ compositorHandlePresentCompleteNotify (DisplayInfo *display_info, XPresentComple
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandlePresentCompleteNotify for 0x%lx", ev->window);
+ TRACE ("window 0x%lx", ev->window);
for (list = display_info->screens; list; list = g_slist_next (list))
{
@@ -3598,7 +3589,7 @@ compositorHandleGenericEvent(DisplayInfo *display_info, XGenericEvent *ev)
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleGenericEvent");
+ TRACE ("entering");
if (ev_cookie->extension == display_info->present_opcode)
{
@@ -3792,7 +3783,7 @@ compositorAddWindow (DisplayInfo *display_info, Window id, Client *c)
#ifdef HAVE_COMPOSITOR
g_return_if_fail (display_info != NULL);
g_return_if_fail (id != None);
- TRACE ("entering compositorAddWindow for 0x%lx", id);
+ TRACE ("window 0x%lx", id);
if (!compositorIsUsable (display_info))
{
@@ -3814,7 +3805,7 @@ compositorSetClient (DisplayInfo *display_info, Window id, Client *c)
g_return_val_if_fail (display_info != NULL, FALSE);
g_return_val_if_fail (id != None, FALSE);
- TRACE ("entering compositorSetClient: 0x%lx", id);
+ TRACE ("window 0x%lx", id);
if (!compositorIsUsable (display_info))
{
@@ -3841,7 +3832,7 @@ compositorRemoveWindow (DisplayInfo *display_info, Window id)
#ifdef HAVE_COMPOSITOR
g_return_if_fail (display_info != NULL);
g_return_if_fail (id != None);
- TRACE ("entering compositorRemoveWindow: 0x%lx", id);
+ TRACE ("window 0x%lx", id);
if (!compositorIsUsable (display_info))
{
@@ -3860,7 +3851,7 @@ compositorDamageWindow (DisplayInfo *display_info, Window id)
g_return_if_fail (display_info != NULL);
g_return_if_fail (id != None);
- TRACE ("entering compositorDamageWindow: 0x%lx", id);
+ TRACE ("window 0x%lx", id);
if (!compositorIsUsable (display_info))
{
@@ -3884,7 +3875,7 @@ compositorResizeWindow (DisplayInfo *display_info, Window id, int x, int y, int
g_return_if_fail (display_info != NULL);
g_return_if_fail (id != None);
- TRACE ("entering compositorDamageWindow: 0x%lx", id);
+ TRACE ("window 0x%lx", id);
if (!compositorIsUsable (display_info))
{
@@ -3914,8 +3905,7 @@ compositorGetWindowPixmapAtSize (ScreenInfo *screen_info, Window id, guint *widt
CWindow *cw;
g_return_val_if_fail (id != None, None);
-
- TRACE ("entering compositorGetPixmap: 0x%lx", id);
+ TRACE ("window 0x%lx", id);
if (!compositorIsActive (screen_info))
{
@@ -3939,7 +3929,7 @@ compositorHandleEvent (DisplayInfo *display_info, XEvent *ev)
#ifdef HAVE_COMPOSITOR
g_return_if_fail (display_info != NULL);
g_return_if_fail (ev != NULL);
- TRACE ("entering compositorHandleEvent");
+ TRACE ("event type %i", ev->type);
if (!compositorIsUsable (display_info))
{
@@ -4176,7 +4166,7 @@ compositorSetCompositeMode (DisplayInfo *display_info, gboolean use_manual_redir
{
#ifdef HAVE_COMPOSITOR
g_return_if_fail (display_info != NULL);
- TRACE ("entering compositorSetCompositeMode");
+ TRACE ("entering");
if (use_manual_redirect)
{
@@ -4253,7 +4243,7 @@ compositorManageScreen (ScreenInfo *screen_info)
if (display_info->composite_mode == CompositeRedirectAutomatic)
{
/* That's enough for automatic compositing */
- TRACE ("Automatic compositing enabled");
+ TRACE ("automatic compositing enabled");
return TRUE;
}
@@ -4310,7 +4300,7 @@ compositorManageScreen (ScreenInfo *screen_info)
screen_info->rootBuffer[buffer] = None;
}
XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE);
- TRACE ("Manual compositing enabled");
+ TRACE ("manual compositing enabled");
#ifdef HAVE_PRESENT_EXTENSION
screen_info->use_present = display_info->have_present &&
@@ -4388,7 +4378,7 @@ compositorUnmanageScreen (ScreenInfo *screen_info)
if (!(screen_info->compositor_active))
{
- TRACE ("Compositor not active on screen %i", screen_info->screen);
+ TRACE ("compositor not active on screen %i", screen_info->screen);
return;
}
screen_info->compositor_active = FALSE;
@@ -4406,7 +4396,7 @@ compositorUnmanageScreen (ScreenInfo *screen_info)
}
g_list_free (screen_info->cwindows);
screen_info->cwindows = NULL;
- TRACE ("Compositor: removed %i window(s) remaining", i);
+ TRACE ("compositor: removed %i window(s) remaining", i);
#if HAVE_OVERLAYS
if (display_info->have_overlays)
@@ -4517,7 +4507,7 @@ compositorAddAllWindows (ScreenInfo *screen_info)
Window w1, w2, *wins;
unsigned int count, i;
- TRACE ("entering compositorAddScreen");
+ TRACE ("entering");
display_info = screen_info->display_info;
if (!compositorIsUsable (display_info))
@@ -4550,7 +4540,7 @@ compositorActivateScreen (ScreenInfo *screen_info, gboolean active)
DisplayInfo *display_info;
g_return_val_if_fail (screen_info != NULL, FALSE);
- TRACE ("entering compositorActivateScreen");
+ TRACE ("active %s", active ? "TRUE" : "FALSE");
display_info = screen_info->display_info;
if (!compositorIsUsable (display_info))
@@ -4587,7 +4577,7 @@ compositorUpdateScreenSize (ScreenInfo *screen_info)
gushort buffer;
g_return_if_fail (screen_info != NULL);
- TRACE ("entering compositorUpdateScreenSize");
+ TRACE ("entering");
display_info = screen_info->display_info;
if (!compositorIsUsable (display_info))
@@ -4640,7 +4630,7 @@ compositorWindowSetOpacity (DisplayInfo *display_info, Window id, guint32 opacit
g_return_if_fail (display_info != NULL);
g_return_if_fail (id != None);
- TRACE ("entering compositorSetOpacity for 0x%lx", id);
+ TRACE ("window 0x%lx", id);
if (!compositorIsUsable (display_info))
{
@@ -4663,7 +4653,7 @@ compositorRebuildScreen (ScreenInfo *screen_info)
GList *list;
g_return_if_fail (screen_info != NULL);
- TRACE ("entering compositorRebuildScreen");
+ TRACE ("entering");
display_info = screen_info->display_info;
if (!compositorIsUsable (display_info))
@@ -4688,7 +4678,7 @@ compositorTestServer (DisplayInfo *display_info)
char *vendor;
g_return_val_if_fail (display_info != NULL, FALSE);
- TRACE ("entering compositorTestServer");
+ TRACE ("entering");
vendor = ServerVendor (display_info->dpy);
diff --git a/src/cycle.c b/src/cycle.c
index b249fdc..ce0bc82 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -70,7 +70,7 @@ clientGetCycleRange (ScreenInfo *screen_info)
guint range;
g_return_val_if_fail (screen_info != NULL, 0);
- TRACE ("entering clientGetCycleRange");
+ TRACE ("entering");
range = 0;
if (screen_info->params->cycle_hidden)
@@ -98,7 +98,7 @@ clientCycleCreateList (Client *c)
GList *client_list;
g_return_val_if_fail (c, NULL);
- TRACE ("entering clientCycleCreateList");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
range = clientGetCycleRange (screen_info);
@@ -158,7 +158,7 @@ clientCycleCreateList (Client *c)
}
}
- TRACE ("clientCycleCreateList: adding %s", c2->name);
+ TRACE ("adding %s", c2->name);
client_list = g_list_append (client_list, c2);
}
@@ -173,7 +173,7 @@ clientCycleFocusAndRaise (Client *c)
Client *sibling;
g_return_if_fail (c != NULL);
- TRACE ("entering clientFocusAndRaise");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -254,7 +254,7 @@ clientCycleEventFilter (XfwmEvent *event, gpointer data)
gboolean cycling, gone;
GList *li;
- TRACE ("entering clientCycleEventFilter");
+ TRACE ("entering");
passdata = (ClientCycleData *) data;
c = tabwinGetSelected(passdata->tabwin);
@@ -313,12 +313,12 @@ clientCycleEventFilter (XfwmEvent *event, gpointer data)
}
else if (key == KEY_CYCLE_REVERSE_WINDOWS)
{
- TRACE ("Cycle: previous");
+ TRACE ("cycle: previous");
c2 = tabwinSelectPrev(passdata->tabwin);
}
else if (key == KEY_CYCLE_WINDOWS)
{
- TRACE ("Cycle: next");
+ TRACE ("cycle: next");
c2 = tabwinSelectNext(passdata->tabwin);
}
if (c2)
@@ -364,13 +364,13 @@ clientCycleEventFilter (XfwmEvent *event, gpointer data)
else if (event->button.button == Button4)
{
/* Mouse wheel scroll up */
- TRACE ("Cycle: previous");
+ TRACE ("cycle: previous");
c2 = tabwinSelectPrev(passdata->tabwin);
}
else if (event->button.button == Button5)
{
/* Mouse wheel scroll down */
- TRACE ("Cycle: next");
+ TRACE ("cycle: next");
c2 = tabwinSelectNext(passdata->tabwin);
}
}
@@ -452,7 +452,7 @@ clientCycle (Client * c, XfwmEventKey *event)
int key, modifier;
g_return_if_fail (c != NULL);
- TRACE ("entering clientCycle");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -585,7 +585,7 @@ clientSwitchApp (void)
Client *focus, *new;
guint range;
- TRACE ("entering clientSwitchApp");
+ TRACE ("entering");
focus = clientGetFocus();
if (!focus)
diff --git a/src/display.c b/src/display.c
index d79871c..0b1de7e 100644
--- a/src/display.c
+++ b/src/display.c
@@ -600,7 +600,7 @@ myDisplayGetScreenFromRoot (DisplayInfo *display, Window root)
return screen;
}
}
- TRACE ("myDisplayGetScreenFromRoot: no screen found");
+ TRACE ("no screen found");
return NULL;
}
@@ -621,7 +621,7 @@ myDisplayGetScreenFromOutput (DisplayInfo *display, Window output)
return screen;
}
}
- TRACE ("myDisplayGetScreenFromOutput: no screen found for output window 0x%lx", output);
+ TRACE ("no screen found for output window 0x%lx", output);
#endif
return NULL;
@@ -643,7 +643,7 @@ myDisplayGetScreenFromNum (DisplayInfo *display, int num)
return screen;
}
}
- TRACE ("myDisplayGetScreenFromNum: no screen found");
+ TRACE ("no screen found");
return NULL;
}
@@ -658,7 +658,7 @@ myDisplayGetRootFromWindow(DisplayInfo *display, Window w)
if (!XGetWindowAttributes(display->dpy, w, &attributes))
{
- TRACE ("myDisplayGetRootFromWindow: no root found for 0x%lx", w);
+ TRACE ("no root found for 0x%lx", w);
return None;
}
return attributes.root;
@@ -690,7 +690,7 @@ myDisplayGetScreenFromWindow (DisplayInfo *display, Window w)
return screen;
}
}
- TRACE ("myDisplayGetScreenFromWindow: no screen found for 0x%lx", w);
+ TRACE ("no screen found for 0x%lx", w);
return NULL;
}
@@ -712,7 +712,7 @@ myDisplayGetScreenFromSystray (DisplayInfo *display, Window w)
return screen;
}
}
- TRACE ("myDisplayGetScreenFromSystray: no screen found");
+ TRACE ("no screen found");
return NULL;
}
@@ -837,7 +837,7 @@ myDisplayGetCurrentTime (DisplayInfo *display)
{
g_return_val_if_fail (display != NULL, (guint32) CurrentTime);
- TRACE ("myDisplayGetCurrentTime gives timestamp=%u", (guint32) display->current_time);
+ TRACE ("timestamp=%u", (guint32) display->current_time);
return display->current_time;
}
@@ -852,7 +852,7 @@ myDisplayGetTime (DisplayInfo * display, guint32 timestamp)
display_timestamp = getXServerTime (display);
}
- TRACE ("myDisplayGetTime gives timestamp=%u", (guint32) display_timestamp);
+ TRACE ("timestamp=%u", (guint32) display_timestamp);
return display_timestamp;
}
@@ -861,7 +861,7 @@ myDisplayGetLastUserTime (DisplayInfo *display)
{
g_return_val_if_fail (display != NULL, (guint32) CurrentTime);
- TRACE ("myDisplayGetLastUserTime gives timestamp=%u", (guint32) display->last_user_time);
+ TRACE ("timestamp=%u", (guint32) display->last_user_time);
return display->last_user_time;
}
@@ -913,7 +913,7 @@ myDisplayTestXrender (DisplayInfo *display, gdouble min_time)
int iterations;
g_return_val_if_fail (display != NULL, FALSE);
- TRACE ("entering myDisplayTesxrender");
+ TRACE ("entering");
c.alpha = 0x7FFF;
c.red = 0xFFFF;
diff --git a/src/event_filter.c b/src/event_filter.c
index 5c2d78d..2da8ff4 100644
--- a/src/event_filter.c
+++ b/src/event_filter.c
@@ -38,112 +38,112 @@ default_event_filter (XfwmEvent *event, gpointer data)
switch (event->meta.type)
{
case XFWM_EVENT_KEY:
- TRACE ("Unhandled XFWM_EVENT_KEY [%d] event", event->key.pressed);
+ TRACE ("unhandled XFWM_EVENT_KEY [%d] event", event->key.pressed);
break;
case XFWM_EVENT_BUTTON:
- TRACE ("Unhandled XFWM_EVENT_BUTTON [%d] event", event->button.pressed);
+ TRACE ("unhandled XFWM_EVENT_BUTTON [%d] event", event->button.pressed);
break;
case XFWM_EVENT_MOTION:
- TRACE ("Unhandled XFWM_EVENT_MOTION event");
+ TRACE ("unhandled XFWM_EVENT_MOTION event");
break;
case XFWM_EVENT_CROSSING:
- TRACE ("Unhandled XFWM_EVENT_CROSSING [%d] event", event->crossing.enter);
+ TRACE ("unhandled XFWM_EVENT_CROSSING [%d] event", event->crossing.enter);
break;
case XFWM_EVENT_X:
switch (event->meta.x->type)
{
case KeyPress:
- TRACE ("Unhandled KeyPress event");
+ TRACE ("unhandled KeyPress event");
break;
case KeyRelease:
- TRACE ("Unhandled KeyRelease event");
+ TRACE ("unhandled KeyRelease event");
break;
case ButtonPress:
- TRACE ("Unhandled ButtonPress event");
+ TRACE ("unhandled ButtonPress event");
break;
case ButtonRelease:
- TRACE ("Unhandled ButtonRelease event");
+ TRACE ("unhandled ButtonRelease event");
break;
case MotionNotify:
- TRACE ("Unhandled MotionNotify event");
+ TRACE ("unhandled MotionNotify event");
break;
case EnterNotify:
- TRACE ("Unhandled EnterNotify event");
+ TRACE ("unhandled EnterNotify event");
break;
case LeaveNotify:
- TRACE ("Unhandled LeaveNotify event");
+ TRACE ("unhandled LeaveNotify event");
break;
case FocusIn:
- TRACE ("Unhandled FocusIn event");
+ TRACE ("unhandled FocusIn event");
break;
case FocusOut:
- TRACE ("Unhandled FocusOut event");
+ TRACE ("unhandled FocusOut event");
break;
case KeymapNotify:
- TRACE ("Unhandled KeymapNotify event");
+ TRACE ("unhandled KeymapNotify event");
break;
case Expose:
- TRACE ("Unhandled Expose event");
+ TRACE ("unhandled Expose event");
break;
case GraphicsExpose:
- TRACE ("Unhandled GraphicsExpose event");
+ TRACE ("unhandled GraphicsExpose event");
break;
case NoExpose:
- TRACE ("Unhandled NoExpose event");
+ TRACE ("unhandled NoExpose event");
break;
case VisibilityNotify:
- TRACE ("Unhandled VisibilityNotify event");
+ TRACE ("unhandled VisibilityNotify event");
break;
case DestroyNotify:
- TRACE ("Unhandled DestroyNotify event");
+ TRACE ("unhandled DestroyNotify event");
break;
case UnmapNotify:
- TRACE ("Unhandled UnmapNotify event");
+ TRACE ("unhandled UnmapNotify event");
break;
case MapNotify:
- TRACE ("Unhandled MapNotify event");
+ TRACE ("unhandled MapNotify event");
break;
case MapRequest:
- TRACE ("Unhandled MapRequest event");
+ TRACE ("unhandled MapRequest event");
break;
case ReparentNotify:
- TRACE ("Unhandled ReparentNotify event");
+ TRACE ("unhandled ReparentNotify event");
break;
case ConfigureNotify:
- TRACE ("Unhandled ConfigureNotify event");
+ TRACE ("unhandled ConfigureNotify event");
break;
case ConfigureRequest:
- TRACE ("Unhandled ConfigureRequest event");
+ TRACE ("unhandled ConfigureRequest event");
break;
case GravityNotify:
- TRACE ("Unhandled GravityNotify event");
+ TRACE ("unhandled GravityNotify event");
break;
case ResizeRequest:
- TRACE ("Unhandled ResizeRequest event");
+ TRACE ("unhandled ResizeRequest event");
break;
case CirculateNotify:
- TRACE ("Unhandled CirculateNotify event");
+ TRACE ("unhandled CirculateNotify event");
break;
case CirculateRequest:
- TRACE ("Unhandled CirculateRequest event");
+ TRACE ("unhandled CirculateRequest event");
break;
case PropertyNotify:
- TRACE ("Unhandled PropertyNotify event");
+ TRACE ("unhandled PropertyNotify event");
break;
case SelectionClear:
- TRACE ("Unhandled SelectionClear event");
+ TRACE ("unhandled SelectionClear event");
break;
case SelectionRequest:
- TRACE ("Unhandled SelectionRequest event");
+ TRACE ("unhandled SelectionRequest event");
break;
case SelectionNotify:
- TRACE ("Unhandled SelectionNotify event");
+ TRACE ("unhandled SelectionNotify event");
break;
case ColormapNotify:
- TRACE ("Unhandled ColormapNotify event");
+ TRACE ("unhandled ColormapNotify event");
break;
default:
- TRACE ("Unhandled Unknown event");
+ TRACE ("unhandled Unknown event");
break;
}
}
@@ -259,7 +259,7 @@ eventFilterAddWin (GdkScreen *gscr, XfwmDevices *devices, long event_mask)
if (error)
{
- TRACE ("eventFilterAddWin error code: %i", error);
+ TRACE ("error code: %i", error);
return (NULL);
}
diff --git a/src/events.c b/src/events.c
index 70f3e58..688943c 100644
--- a/src/events.c
+++ b/src/events.c
@@ -236,7 +236,7 @@ typeOfClick (ScreenInfo *screen_info, Window w, XfwmEventButton *event, gboolean
if (!g)
{
- TRACE ("grab failed in typeOfClick");
+ TRACE ("grab failed");
#if GTK_CHECK_VERSION(3, 22, 0)
gdk_display_beep (display_info->gdisplay);
#else
@@ -259,18 +259,18 @@ typeOfClick (ScreenInfo *screen_info, Window w, XfwmEventButton *event, gboolean
passdata.allow_double_click = allow_double_click;
passdata.double_click_time = display_info->double_click_time;
passdata.double_click_distance = display_info->double_click_distance;
- TRACE ("Double click time= %i, distance=%i\n", display_info->double_click_time,
+ TRACE ("double click time= %i, distance=%i\n", display_info->double_click_time,
display_info->double_click_distance);
passdata.timeout = g_timeout_add_full (G_PRIORITY_HIGH,
display_info->double_click_time,
(GSourceFunc) typeOfClick_end,
(gpointer) &passdata, NULL);
- TRACE ("entering typeOfClick loop");
+ TRACE ("entering loop");
eventFilterPush (display_info->xfilter, typeOfClick_event_filter, &passdata);
gtk_main ();
eventFilterPop (display_info->xfilter);
- TRACE ("leaving typeOfClick loop");
+ TRACE ("leaving loop");
myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
@@ -290,7 +290,7 @@ toggle_show_desktop (ScreenInfo *screen_info)
static eventFilterStatus
handleMotionNotify (DisplayInfo *display_info, XfwmEventMotion *event)
{
- TRACE ("entering handleMotionNotify");
+ TRACE ("entering");
return EVENT_FILTER_REMOVE;
}
@@ -303,7 +303,7 @@ handleKeyPress (DisplayInfo *display_info, XfwmEventKey *event)
Client *c;
int key;
- TRACE ("entering handleKeyPress");
+ TRACE ("entering");
ev_screen_info = myDisplayGetScreenFromRoot (display_info, event->root);
if (!ev_screen_info)
@@ -580,7 +580,7 @@ handleKeyPress (DisplayInfo *display_info, XfwmEventKey *event)
static eventFilterStatus
handleKeyRelease (DisplayInfo *display_info, XfwmEventKey *event)
{
- TRACE ("entering handleKeyRelease");
+ TRACE ("entering");
/* Release pending events */
XAllowEvents (display_info->dpy, SyncKeyboard, CurrentTime);
@@ -912,7 +912,7 @@ handleButtonPress (DisplayInfo *display_info, XfwmEventButton *event)
guint state, part;
gboolean replay;
- TRACE ("entering handleButtonPress");
+ TRACE ("entering");
replay = FALSE;
c = myDisplayGetClientFromWindow (display_info, event->meta.window,
@@ -1104,7 +1104,7 @@ handleButtonRelease (DisplayInfo *display_info, XfwmEventButton *event)
{
ScreenInfo *screen_info;
- TRACE ("entering handleButtonRelease");
+ TRACE ("entering");
/* Get the screen structure from the root of the event */
screen_info = myDisplayGetScreenFromRoot (display_info, event->root);
@@ -1131,8 +1131,7 @@ handleDestroyNotify (DisplayInfo *display_info, XDestroyWindowEvent * ev)
ScreenInfo *screen_info;
#endif
- TRACE ("entering handleDestroyNotify");
- TRACE ("DestroyNotify on window (0x%lx)", ev->window);
+ TRACE ("window (0x%lx)", ev->window);
status = EVENT_FILTER_PASS;
#ifdef ENABLE_KDE_SYSTRAY_PROXY
@@ -1148,7 +1147,7 @@ handleDestroyNotify (DisplayInfo *display_info, XDestroyWindowEvent * ev)
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_WINDOW);
if (c)
{
- TRACE ("DestroyNotify for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
list_of_windows = clientListTransientOrModal (c);
clientPassFocus (c->screen_info, c, list_of_windows);
clientUnframe (c, FALSE);
@@ -1165,13 +1164,12 @@ handleMapRequest (DisplayInfo *display_info, XMapRequestEvent * ev)
eventFilterStatus status;
Client *c;
- TRACE ("entering handleMapRequest");
- TRACE ("MapRequest on window (0x%lx)", ev->window);
+ TRACE ("window (0x%lx)", ev->window);
status = EVENT_FILTER_PASS;
if (ev->window == None)
{
- TRACE ("Mapping None ???");
+ TRACE ("mapping None ???");
return status;
}
@@ -1180,11 +1178,9 @@ handleMapRequest (DisplayInfo *display_info, XMapRequestEvent * ev)
{
ScreenInfo *screen_info = c->screen_info;
- TRACE ("handleMapRequest: clientShow");
-
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MAP_PENDING))
{
- TRACE ("Ignoring MapRequest on window (0x%lx)", ev->window);
+ TRACE ("ignoring MapRequest on window (0x%lx)", ev->window);
status = EVENT_FILTER_REMOVE;
}
@@ -1203,7 +1199,6 @@ handleMapRequest (DisplayInfo *display_info, XMapRequestEvent * ev)
}
else
{
- TRACE ("handleMapRequest: clientFrame");
clientFrame (display_info, ev->window, FALSE);
status = EVENT_FILTER_REMOVE;
}
@@ -1216,13 +1211,12 @@ handleMapNotify (DisplayInfo *display_info, XMapEvent * ev)
{
Client *c;
- TRACE ("entering handleMapNotify");
- TRACE ("MapNotify on window (0x%lx)", ev->window);
+ TRACE ("window (0x%lx)", ev->window);
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_WINDOW);
if (c)
{
- TRACE ("MapNotify for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MAP_PENDING))
{
FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MAP_PENDING);
@@ -1241,26 +1235,24 @@ handleUnmapNotify (DisplayInfo *display_info, XUnmapEvent * ev)
GList *list_of_windows;
Client *c;
- TRACE ("entering handleUnmapNotify");
- TRACE ("UnmapNotify on window (0x%lx)", ev->window);
+ TRACE ("window (0x%lx)", ev->window);
status = EVENT_FILTER_PASS;
if (ev->from_configure)
{
- TRACE ("Ignoring UnmapNotify caused by parent's resize");
+ TRACE ("ignoring UnmapNotify caused by parent's resize");
return status;
}
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_WINDOW);
if (c)
{
- TRACE ("UnmapNotify for \"%s\" (0x%lx)", c->name, c->window);
- TRACE ("ignore_unmap for \"%s\" is %i", c->name, c->ignore_unmap);
+ TRACE ("client \"%s\" (0x%lx) ignore_unmap %i", c->name, c->window, c->ignore_unmap);
screen_info = c->screen_info;
if ((ev->event != ev->window) && (ev->event != screen_info->xroot || !ev->send_event))
{
- TRACE ("handleUnmapNotify (): Event ignored");
+ TRACE ("event ignored");
return status;
}
@@ -1272,7 +1264,7 @@ handleUnmapNotify (DisplayInfo *display_info, XUnmapEvent * ev)
* so we just ignore it, so the window won't return
* to withdrawn state by mistake.
*/
- TRACE ("Client \"%s\" is not mapped, event ignored", c->name);
+ TRACE ("client \"%s\" is not mapped, event ignored", c->name);
return status;
}
@@ -1300,8 +1292,7 @@ handleUnmapNotify (DisplayInfo *display_info, XUnmapEvent * ev)
if (c->ignore_unmap)
{
c->ignore_unmap--;
- TRACE ("ignore_unmap for \"%s\" is now %i",
- c->name, c->ignore_unmap);
+ TRACE ("ignore_unmap for \"%s\" is now %i", c->name, c->ignore_unmap);
}
else
{
@@ -1319,7 +1310,7 @@ handleUnmapNotify (DisplayInfo *display_info, XUnmapEvent * ev)
static eventFilterStatus
handleConfigureNotify (DisplayInfo *display_info, XConfigureEvent * ev)
{
- TRACE ("entering handleConfigureNotify");
+ TRACE ("entering");
return EVENT_FILTER_PASS;
}
@@ -1329,8 +1320,7 @@ handleConfigureRequest (DisplayInfo *display_info, XConfigureRequestEvent * ev)
Client *c;
XWindowChanges wc;
- TRACE ("entering handleConfigureRequest");
- TRACE ("ConfigureRequest on window (0x%lx)", ev->window);
+ TRACE ("window (0x%lx)", ev->window);
wc.x = ev->x;
wc.y = ev->y;
@@ -1372,7 +1362,7 @@ handleConfigureRequest (DisplayInfo *display_info, XConfigureRequestEvent * ev)
}
if (c)
{
- TRACE ("handleConfigureRequest managed window \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("window \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING))
{
/* Sorry, but it's not the right time for configure request */
@@ -1383,7 +1373,7 @@ handleConfigureRequest (DisplayInfo *display_info, XConfigureRequestEvent * ev)
}
else
{
- TRACE ("unmanaged configure request for win 0x%lx", ev->window);
+ TRACE ("unmanaged configure request for window 0x%lx", ev->window);
XConfigureWindow (display_info->dpy, ev->window, ev->value_mask, &wc);
}
@@ -1400,7 +1390,7 @@ handleEnterNotify (DisplayInfo *display_info, XfwmEventCrossing *event)
/* See http://rfc-ref.org/RFC-TEXTS/1013/chapter12.html for details */
- TRACE ("entering handleEnterNotify");
+ TRACE ("entering");
if ((event->mode == NotifyGrab) || (event->mode == NotifyUngrab)
|| (event->detail > NotifyNonlinearVirtual))
@@ -1409,7 +1399,7 @@ handleEnterNotify (DisplayInfo *display_info, XfwmEventCrossing *event)
return EVENT_FILTER_PASS;
}
- TRACE ("EnterNotify on window (0x%lx)", event->meta.window);
+ TRACE ("window (0x%lx)", event->meta.window);
need_redraw = FALSE;
c = myDisplayGetClientFromWindow (display_info, event->meta.window,
@@ -1418,7 +1408,7 @@ handleEnterNotify (DisplayInfo *display_info, XfwmEventCrossing *event)
{
screen_info = c->screen_info;
- TRACE ("EnterNotify window is \"%s\"", c->name);
+ TRACE ("client \"%s\"", c->name);
if (!(screen_info->params->click_to_focus) && clientAcceptFocus (c))
{
if (!(c->type & (WINDOW_DOCK | WINDOW_DESKTOP)))
@@ -1492,7 +1482,7 @@ handleLeaveNotify (DisplayInfo *display_info, XfwmEventCrossing *event)
int b;
gboolean need_redraw;
- TRACE ("entering handleLeaveNotify");
+ TRACE ("entering");
need_redraw = FALSE;
c = myDisplayGetClientFromWindow (display_info, event->meta.window,
@@ -1531,8 +1521,7 @@ handleFocusIn (DisplayInfo *display_info, XFocusChangeEvent * ev)
/* See http://rfc-ref.org/RFC-TEXTS/1013/chapter12.html for details */
- TRACE ("entering handleFocusIn");
- TRACE ("handleFocusIn (0x%lx) mode = %s",
+ TRACE ("window (0x%lx) mode = %s",
ev->window,
(ev->mode == NotifyNormal) ?
"NotifyNormal" :
@@ -1543,7 +1532,7 @@ handleFocusIn (DisplayInfo *display_info, XFocusChangeEvent * ev)
(ev->mode == NotifyUngrab) ?
"NotifyUngrab" :
"(unknown)");
- TRACE ("handleFocusIn (0x%lx) detail = %s",
+ TRACE ("window (0x%lx) detail = %s",
ev->window,
(ev->detail == NotifyAncestor) ?
"NotifyAncestor" :
@@ -1587,10 +1576,10 @@ handleFocusIn (DisplayInfo *display_info, XFocusChangeEvent * ev)
user_focus = clientGetUserFocus ();
current_focus = clientGetFocus ();
- TRACE ("FocusIn on window (0x%lx)", ev->window);
+ TRACE ("window (0x%lx)", ev->window);
if ((c) && (c != current_focus) && (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_VISIBLE)))
{
- TRACE ("Focus transfered to \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("focus transfered to \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -1612,12 +1601,12 @@ handleFocusIn (DisplayInfo *display_info, XFocusChangeEvent * ev)
!clientSameGroup (c, user_focus) &&
!clientIsTransientOrModalFor (c, user_focus))
{
- TRACE ("Setting focus back to \"%s\" (0x%lx)", user_focus->name, user_focus->window);
+ TRACE ("setting focus back to \"%s\" (0x%lx)", user_focus->name, user_focus->window);
clientSetFocus (user_focus->screen_info, user_focus, getXServerTime (display_info), NO_FOCUS_FLAG);
if (current_focus)
{
- TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
clientSetNetState (c);
}
@@ -1640,15 +1629,14 @@ handleFocusOut (DisplayInfo *display_info, XFocusChangeEvent * ev)
/* See http://rfc-ref.org/RFC-TEXTS/1013/chapter12.html for details */
- TRACE ("entering handleFocusOut");
- TRACE ("handleFocusOut (0x%lx) mode = %s",
+ TRACE ("window (0x%lx) mode = %s",
ev->window,
(ev->mode == NotifyNormal) ?
"NotifyNormal" :
(ev->mode == NotifyWhileGrabbed) ?
"NotifyWhileGrabbed" :
"(unknown)");
- TRACE ("handleFocusOut (0x%lx) detail = %s",
+ TRACE ("window (0x%lx) detail = %s",
ev->window,
(ev->detail == NotifyAncestor) ?
"NotifyAncestor" :
@@ -1680,7 +1668,7 @@ handleFocusOut (DisplayInfo *display_info, XFocusChangeEvent * ev)
|| (ev->detail == NotifyNonlinearVirtual)))
{
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_FRAME | SEARCH_WINDOW);
- TRACE ("FocusOut on window (0x%lx)", ev->window);
+ TRACE ("window (0x%lx)", ev->window);
if ((c) && (c == clientGetFocus ()))
{
TRACE ("focus lost from \"%s\" (0x%lx)", c->name, c->window);
@@ -1699,7 +1687,7 @@ handlePropertyNotify (DisplayInfo *display_info, XPropertyEvent * ev)
ScreenInfo *screen_info;
Client *c;
- TRACE ("entering handlePropertyNotify");
+ TRACE ("entering");
status = EVENT_FILTER_PASS;
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_WINDOW | SEARCH_WIN_USER_TIME);
@@ -1818,7 +1806,7 @@ handlePropertyNotify (DisplayInfo *display_info, XPropertyEvent * ev)
TRACE ("client \"%s\" (0x%lx) has received a NET_WM_PID notify", c->name, c->window);
getHint (display_info, c->window, NET_WM_PID, (long *) &pid);
c->pid = (GPid) pid;
- TRACE ("Client \"%s\" (0x%lx) updated PID = %i", c->name, c->window, c->pid);
+ TRACE ("client \"%s\" (0x%lx) updated PID = %i", c->name, c->window, c->pid);
}
else if (ev->atom == display_info->atoms[NET_WM_WINDOW_OPACITY])
{
@@ -1877,7 +1865,7 @@ handlePropertyNotify (DisplayInfo *display_info, XPropertyEvent * ev)
#ifdef HAVE_XSYNC
else if (ev->atom == display_info->atoms[NET_WM_SYNC_REQUEST_COUNTER])
{
- TRACE ("Window 0x%lx has received NET_WM_SYNC_REQUEST_COUNTER", c->window);
+ TRACE ("window 0x%lx has received NET_WM_SYNC_REQUEST_COUNTER", c->window);
clientGetXSyncCounter (c);
}
#endif /* HAVE_XSYNC */
@@ -1919,8 +1907,7 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev)
ScreenInfo *screen_info;
Client *c;
- TRACE ("entering handleClientMessage");
- TRACE ("handleClientMessage from window (0x%lx)", ev->window);
+ TRACE ("window (0x%lx)", ev->window);
if (ev->window == None)
{
@@ -2119,7 +2106,7 @@ handleShape (DisplayInfo *display_info, XShapeEvent * ev)
Client *c;
gboolean update;
- TRACE ("entering handleShape");
+ TRACE ("entering");
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_WINDOW);
if (c)
@@ -2161,7 +2148,7 @@ handleColormapNotify (DisplayInfo *display_info, XColormapEvent * ev)
{
Client *c;
- TRACE ("entering handleColormapNotify");
+ TRACE ("entering");
c = myDisplayGetClientFromWindow (display_info, ev->window, SEARCH_WINDOW);
if ((c) && (ev->window == c->window) && (ev->new))
@@ -2179,7 +2166,7 @@ handleColormapNotify (DisplayInfo *display_info, XColormapEvent * ev)
static eventFilterStatus
handleReparentNotify (DisplayInfo *display_info, XReparentEvent * ev)
{
- TRACE ("entering handleReparentNotify, 0x%lx reparented in 0x%lx", ev->window, ev->parent);
+ TRACE ("window 0x%lx reparented in 0x%lx", ev->window, ev->parent);
return EVENT_FILTER_PASS;
}
@@ -2189,7 +2176,7 @@ handleXSyncAlarmNotify (DisplayInfo *display_info, XSyncAlarmNotifyEvent * ev)
{
Client *c;
- TRACE ("entering handleXSyncAlarmNotify");
+ TRACE ("entering");
if (display_info->have_xsync)
{
c = myDisplayGetClientFromXSyncAlarm (display_info, ev->alarm);
@@ -2208,7 +2195,7 @@ handleEvent (DisplayInfo *display_info, XfwmEvent *event)
eventFilterStatus status;
status = EVENT_FILTER_PASS;
- TRACE ("entering handleEvent");
+ TRACE ("entering");
/* Update the display time */
myDisplayUpdateCurrentTime (display_info, event);
@@ -2339,9 +2326,9 @@ xfwm4_event_filter (XfwmEvent *event, gpointer data)
display_info = (DisplayInfo *) data;
- TRACE ("entering xfwm4_event_filter");
+ TRACE ("entering");
status = handleEvent (display_info, event);
- TRACE ("leaving xfwm4_event_filter");
+ TRACE ("leaving");
return EVENT_FILTER_STOP | status;
}
@@ -2352,7 +2339,7 @@ menu_callback (Menu * menu, MenuOp op, Window xid, gpointer menu_data, gpointer
{
Client *c;
- TRACE ("entering menu_callback");
+ TRACE ("entering");
if (!xfwmWindowDeleted(&menu_event_window))
{
@@ -2468,7 +2455,7 @@ show_window_menu (Client *c, gint px, gint py, guint button, guint32 timestamp)
gboolean is_transient;
gint x, y;
- TRACE ("entering show_window_menu (%d,%d)", px, py);
+ TRACE ("coords (%d,%d)", px, py);
if ((button != Button1) && (button != Button3))
{
@@ -2662,7 +2649,7 @@ show_window_menu (Client *c, gint px, gint py, guint button, guint32 timestamp)
if (!menu_popup (menu, x, y, button, timestamp))
{
- TRACE ("Cannot open menu");
+ TRACE ("cannot open menu");
#if GTK_CHECK_VERSION(3, 22, 0)
gdk_display_beep (display_info->gdisplay);
#else
@@ -2678,7 +2665,7 @@ show_window_menu (Client *c, gint px, gint py, guint button, guint32 timestamp)
static gboolean
show_popup_cb (GtkWidget * widget, GdkEventButton * ev, gpointer data)
{
- TRACE ("entering show_popup_cb");
+ TRACE ("entering");
show_window_menu ((Client *) data, (gint) ev->x_root, (gint) ev->y_root, ev->button, ev->time);
@@ -2780,7 +2767,7 @@ size_changed_cb(GdkScreen *gscreen, gpointer data)
DisplayInfo *display_info;
gboolean size_changed;
- TRACE ("entering size_changed_cb");
+ TRACE ("entering");
screen_info = (ScreenInfo *) data;
g_return_if_fail (screen_info);
@@ -2826,7 +2813,7 @@ monitors_changed_cb(GdkScreen *gscreen, gpointer data)
gint previous_num_monitors;
gboolean size_changed;
- TRACE ("entering monitors_changed_cb");
+ TRACE ("entering");
screen_info = (ScreenInfo *) data;
g_return_if_fail (screen_info);
diff --git a/src/focus.c b/src/focus.c
index 24851d7..a8dbda7 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -83,13 +83,13 @@ clientGetTopMostFocusable (ScreenInfo *screen_info, guint layer, GList * exclude
Client *c;
GList *list;
- TRACE ("entering clientGetTopMostFocusable");
+ TRACE ("entering");
top_client.prefered = top_client.highest = NULL;
for (list = screen_info->windows_stack; list; list = g_list_next (list))
{
c = (Client *) list->data;
- TRACE ("*** stack window \"%s\" (0x%lx), layer %i", c->name,
+ TRACE ("stack window \"%s\" (0x%lx), layer %i", c->name,
c->window, (int) c->win_layer);
if (!clientAcceptFocus (c) || (c->type & WINDOW_TYPE_DONT_FOCUS))
@@ -166,7 +166,7 @@ clientFocusNew(Client * c)
* [...] "The special value of zero on a newly mapped window can be used to
* request that the window not be initially focused when it is mapped."
*/
- TRACE ("Given startup time is nil, not focusing \"%s\"", c->name);
+ TRACE ("given startup time is nil, not focusing \"%s\"", c->name);
give_focus = FALSE;
prevented = FALSE;
}
@@ -174,14 +174,14 @@ clientFocusNew(Client * c)
{
if (client_focus->win_layer > c->win_layer)
{
- TRACE ("Not focusing \"%s\" because the current focused window is on a upper layer", c->name);
+ TRACE ("not focusing \"%s\" because the current focused window is on a upper layer", c->name);
give_focus = FALSE;
prevented = TRUE;
}
else if (client_focus->win_layer < c->win_layer)
{
/* We don't use focus stealing prevention against upper layers */
- TRACE ("Ignoring startup prevention because the current focused window is on a lower layer");
+ TRACE ("ignoring startup prevention because the current focused window is on a lower layer");
give_focus = TRUE;
prevented = FALSE;
}
@@ -192,7 +192,7 @@ clientFocusNew(Client * c)
}
else if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_STARTUP_TIME | CLIENT_FLAG_HAS_USER_TIME))
{
- TRACE ("Current time is %u, time for \"%s\" is %u",
+ TRACE ("current time is %u, time for \"%s\" is %u",
(unsigned int) client_focus->user_time,
c->name, (unsigned int) c->user_time);
if (TIMESTAMP_IS_BEFORE (c->user_time, client_focus->user_time))
@@ -240,7 +240,7 @@ clientFocusNew(Client * c)
if (prevented)
{
- TRACE ("clientFocusNew: Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
}
@@ -255,7 +255,7 @@ gboolean
clientSelectMask (Client * c, Client *other, guint mask, guint type)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientSelectMask");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if ((mask & SEARCH_SAME_APPLICATION) && !clientSameApplication (c, other))
{
@@ -322,7 +322,7 @@ clientGetPrevious (Client * c, guint mask, guint type)
Client *c2;
unsigned int i;
- TRACE ("entering clientGetPrevious");
+ TRACE ("entering");
if (c)
{
@@ -351,7 +351,7 @@ clientPassFocus (ScreenInfo *screen_info, Client *c, GList *exclude_list)
int rx, ry, wx, wy;
int look_in_layer;
- TRACE ("entering clientPassFocus");
+ TRACE ("entering");
look_in_layer = (c ? c->win_layer : WIN_LAYER_NORMAL);
new_focus = NULL;
@@ -388,7 +388,7 @@ gboolean
clientAcceptFocus (Client * c)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientAcceptFocus");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
/* Modal dialogs *always* accept focus */
if (FLAG_TEST(c->flags, CLIENT_FLAG_STATE_MODAL))
@@ -409,7 +409,7 @@ clientSortRing(Client *c)
{
ScreenInfo *screen_info;
- TRACE ("entering clientSortRing");
+ TRACE ("entering");
if (c == NULL)
{
return;
@@ -435,7 +435,7 @@ clientSetLast(Client *c)
ScreenInfo *screen_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientSetLast");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
if (screen_info->client_count > 2)
@@ -484,7 +484,7 @@ clientUpdateFocus (ScreenInfo *screen_info, Client * c, unsigned short flags)
Client *c2;
gboolean restacked;
- TRACE ("entering clientUpdateFocus");
+ TRACE ("entering");
c2 = ((client_focus != c) ? client_focus : NULL);
if ((c) && !clientAcceptFocus (c))
@@ -519,7 +519,7 @@ clientUpdateFocus (ScreenInfo *screen_info, Client * c, unsigned short flags)
}
if (FLAG_TEST(c->flags, CLIENT_FLAG_DEMANDS_ATTENTION))
{
- TRACE ("Un-setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("un-setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
}
clientSetNetState (c);
@@ -542,7 +542,7 @@ clientSetFocus (ScreenInfo *screen_info, Client *c, guint32 timestamp, unsigned
{
Client *c2;
- TRACE ("entering clientSetFocus");
+ TRACE ("entering");
c2 = NULL;
if ((c) && !(flags & FOCUS_IGNORE_MODAL))
@@ -561,7 +561,7 @@ clientSetFocus (ScreenInfo *screen_info, Client *c, guint32 timestamp, unsigned
user_focus = c;
if (FLAG_TEST(c->flags, CLIENT_FLAG_DEMANDS_ATTENTION))
{
- TRACE ("Un-setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("un-setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
clientSetNetState (c);
}
@@ -628,7 +628,7 @@ clientInitFocusFlag (Client * c)
guint workspace;
g_return_if_fail (c != NULL);
- TRACE ("entering clientSetFocus");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!clientAcceptFocus (c) || (c->type & WINDOW_TYPE_DONT_FOCUS))
{
@@ -699,8 +699,7 @@ clientGrabMouseButton (Client * c)
ScreenInfo *screen_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientGrabMouseButton");
- TRACE ("grabbing buttons for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
if (screen_info->params->raise_with_any_button)
@@ -719,8 +718,7 @@ void
clientUngrabMouseButton (Client * c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientUngrabMouseButton");
- TRACE ("ungrabing buttons for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
ungrabButton (c->screen_info->display_info->devices, clientGetXDisplay (c),
AnyButton, AnyModifier, c->window);
@@ -735,7 +733,7 @@ clientGrabMouseButtonForAll (ScreenInfo *screen_info)
guint i;
g_return_if_fail (screen_info != NULL);
- TRACE ("entering clientGrabMouseButtonForAll");
+ TRACE ("entering");
for (c = screen_info->clients, i = 0; (c) && (i < screen_info->client_count); c = c->next, i++)
{
@@ -750,7 +748,7 @@ clientUngrabMouseButtonForAll (ScreenInfo *screen_info)
guint i;
g_return_if_fail (screen_info != NULL);
- TRACE ("entering clientUngrabMouseButtonForAll");
+ TRACE ("entering");
for (c = screen_info->clients, i = 0; (c) && (i < screen_info->client_count); c = c->next, i++)
{
@@ -764,8 +762,8 @@ delayed_focus_cb (gpointer data)
ScreenInfo *screen_info;
guint32 timestamp = (guint32) GPOINTER_TO_INT (data);
- TRACE ("entering delayed_focus_cb");
g_return_val_if_fail (delayed_focus != NULL, FALSE);
+ TRACE ("client \"%s\" (0x%lx)", delayed_focus->name, delayed_focus->window);
screen_info = delayed_focus->screen_info;
clientSetFocus (screen_info, delayed_focus, timestamp, NO_FOCUS_FLAG);
diff --git a/src/frame.c b/src/frame.c
index b5a917f..d3ddfec 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -48,7 +48,7 @@ typedef struct
int
frameDecorationLeft (ScreenInfo *screen_info)
{
- TRACE ("entering frameDecorationLeft");
+ TRACE ("entering");
g_return_val_if_fail (screen_info != NULL, 0);
return screen_info->sides[SIDE_LEFT][ACTIVE].width;
@@ -57,7 +57,7 @@ frameDecorationLeft (ScreenInfo *screen_info)
int
frameDecorationRight (ScreenInfo *screen_info)
{
- TRACE ("entering frameDecorationRight");
+ TRACE ("entering");
g_return_val_if_fail (screen_info != NULL, 0);
return screen_info->sides[SIDE_RIGHT][ACTIVE].width;
@@ -66,7 +66,7 @@ frameDecorationRight (ScreenInfo *screen_info)
int
frameDecorationTop (ScreenInfo *screen_info)
{
- TRACE ("entering frameDecorationTop");
+ TRACE ("entering");
g_return_val_if_fail (screen_info != NULL, 0);
return screen_info->title[TITLE_3][ACTIVE].height;
@@ -75,7 +75,7 @@ frameDecorationTop (ScreenInfo *screen_info)
int
frameDecorationBottom (ScreenInfo *screen_info)
{
- TRACE ("entering frameDecorationBottom");
+ TRACE ("entering");
g_return_val_if_fail (screen_info != NULL, 0);
return screen_info->sides[SIDE_BOTTOM][ACTIVE].height;
@@ -84,9 +84,9 @@ frameDecorationBottom (ScreenInfo *screen_info)
int
frameLeft (Client * c)
{
- TRACE ("entering frameLeft");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
@@ -100,9 +100,9 @@ frameLeft (Client * c)
int
frameRight (Client * c)
{
- TRACE ("entering frameRight");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
@@ -116,9 +116,9 @@ frameRight (Client * c)
int
frameTop (Client * c)
{
- TRACE ("entering frameTop");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (CLIENT_HAS_FRAME (c))
{
return c->screen_info->title[TITLE_3][ACTIVE].height;
@@ -129,9 +129,9 @@ frameTop (Client * c)
int
frameBottom (Client * c)
{
- TRACE ("entering frameBottom");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
@@ -145,9 +145,9 @@ frameBottom (Client * c)
int
frameX (Client * c)
{
- TRACE ("entering frameX");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
@@ -161,9 +161,9 @@ frameX (Client * c)
int
frameY (Client * c)
{
- TRACE ("entering frameY");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
{
@@ -175,9 +175,9 @@ frameY (Client * c)
int
frameWidth (Client * c)
{
- TRACE ("entering frameWidth");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN)
&& (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
@@ -191,9 +191,9 @@ frameWidth (Client * c)
int
frameHeight (Client * c)
{
- TRACE ("entering frameHeight");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_BORDER)
&& FLAG_TEST (c->flags, CLIENT_FLAG_SHADED)
&& !FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
@@ -211,9 +211,9 @@ frameHeight (Client * c)
int
frameExtentLeft (Client * c)
{
- TRACE ("entering frameExtentLeft");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS))
{
return -c->frame_extents[SIDE_LEFT];
@@ -224,9 +224,9 @@ frameExtentLeft (Client * c)
int
frameExtentRight (Client * c)
{
- TRACE ("entering frameExtentRight");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS))
{
return -c->frame_extents[SIDE_RIGHT];
@@ -237,9 +237,9 @@ frameExtentRight (Client * c)
int
frameExtentTop (Client * c)
{
- TRACE ("entering frameExtentTop");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS))
{
return -c->frame_extents[SIDE_TOP];
@@ -250,9 +250,9 @@ frameExtentTop (Client * c)
int
frameExtentBottom (Client * c)
{
- TRACE ("entering frameExtentBottom");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS))
{
return -c->frame_extents[SIDE_BOTTOM];
@@ -263,9 +263,9 @@ frameExtentBottom (Client * c)
int
frameExtentX (Client * c)
{
- TRACE ("entering frameExtentX");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS))
{
return c->x + c->frame_extents[SIDE_LEFT];
@@ -276,9 +276,9 @@ frameExtentX (Client * c)
int
frameExtentY (Client * c)
{
- TRACE ("entering frameExtentY");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS))
{
return c->y + c->frame_extents[SIDE_TOP];
@@ -289,9 +289,9 @@ frameExtentY (Client * c)
int
frameExtentWidth (Client * c)
{
- TRACE ("entering frameExtentWidth");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS))
{
return MAX (0, c->width - c->frame_extents[SIDE_LEFT]
@@ -303,9 +303,9 @@ frameExtentWidth (Client * c)
int
frameExtentHeight (Client * c)
{
- TRACE ("entering frameExtentHeight");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST (c->flags, CLIENT_FLAG_HAS_FRAME_EXTENTS))
{
return MAX (0, c->height - c->frame_extents[SIDE_TOP]
@@ -317,9 +317,9 @@ frameExtentHeight (Client * c)
static int
frameTopLeftWidth (Client * c, int state)
{
- TRACE ("entering frameTopLeftWidth");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
&& c->screen_info->params->borderless_maximize)
{
@@ -332,9 +332,9 @@ frameTopLeftWidth (Client * c, int state)
static int
frameTopRightWidth (Client * c, int state)
{
- TRACE ("entering frameTopRightWidth");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
&& c->screen_info->params->borderless_maximize)
{
@@ -346,9 +346,9 @@ frameTopRightWidth (Client * c, int state)
static int
frameButtonOffset (Client *c)
{
- TRACE ("entering frameButtonOffset");
-
g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED)
&& c->screen_info->params->borderless_maximize)
{
@@ -362,11 +362,10 @@ frameFillTitlePixmap (Client * c, int state, int part, int x, int w, int h, xfwm
{
ScreenInfo *screen_info;
- TRACE ("entering frameFillTitlePixmap");
-
g_return_if_fail (c);
g_return_if_fail (title_pm);
g_return_if_fail (top_pm);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -393,11 +392,10 @@ frameCreateTitlePixmap (Client * c, int state, int left, int right, xfwmPixmap *
int voffset, title_x, title_y;
int title_height, top_height;
- TRACE ("entering frameCreateTitlePixmap");
-
g_return_if_fail (c);
g_return_if_fail (title_pm);
g_return_if_fail (top_pm);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -602,7 +600,8 @@ getButtonFromLetter (char chr, Client * c)
{
int b;
- TRACE ("entering getButtonFromLetter");
+ g_return_val_if_fail (c != NULL, -1);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
b = -1;
switch (chr)
@@ -654,7 +653,8 @@ getLetterFromButton (int i, Client * c)
{
char chr;
- TRACE ("entering getLetterFromButton");
+ g_return_val_if_fail (c != NULL, 0);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
chr = 0;
switch (i)
@@ -707,8 +707,8 @@ frameSetShape (Client * c, int state, FramePixmap * frame_pix, int button_x[BUTT
xfwmPixmap *my_pixmap;
int i;
- TRACE ("entering frameSetShape");
- TRACE ("setting shape for client (0x%lx)", c->window);
+ g_return_if_fail (c != NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -952,8 +952,8 @@ frameSetShapeInput (Client * c)
ScreenInfo *screen_info;
DisplayInfo *display_info;
- TRACE ("entering frameSetShapeInput");
- TRACE ("setting shape input for client (0x%lx)", c->window);
+ g_return_if_fail (c != NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -993,10 +993,8 @@ frameDrawWin (Client * c)
gboolean width_changed;
gboolean height_changed;
- TRACE ("entering frameDraw");
- TRACE ("drawing frame for \"%s\" (0x%lx)", c->name, c->window);
-
g_return_if_fail (c != NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
frameClearQueueDraw (c);
@@ -1325,10 +1323,9 @@ update_frame_idle_cb (gpointer data)
{
Client *c;
- TRACE ("entering update_frame_idle_cb");
-
c = (Client *) data;
g_return_val_if_fail (c, FALSE);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
frameDrawWin (c);
c->frame_timeout_id = 0;
@@ -1340,8 +1337,7 @@ void
frameClearQueueDraw (Client * c)
{
g_return_if_fail (c);
-
- TRACE ("entering frameClearQueueDraw for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (c->frame_timeout_id)
{
@@ -1354,8 +1350,7 @@ void
frameDraw (Client * c, gboolean clear_all)
{
g_return_if_fail (c);
-
- TRACE ("entering frameDraw for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (clear_all)
{
@@ -1368,8 +1363,7 @@ void
frameQueueDraw (Client * c, gboolean clear_all)
{
g_return_if_fail (c);
-
- TRACE ("entering frameQueueDraw for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
/* Reschedule update */
if (c->frame_timeout_id)
diff --git a/src/hints.c b/src/hints.c
index ae36399..97f08c5 100644
--- a/src/hints.c
+++ b/src/hints.c
@@ -84,7 +84,7 @@ getWMState (DisplayInfo *display_info, Window w)
unsigned char *data;
unsigned long state;
- TRACE ("entering getWmState");
+ TRACE ("window 0x%lx", w);
data = NULL;
state = WithdrawnState;
@@ -107,7 +107,7 @@ setWMState (DisplayInfo *display_info, Window w, unsigned long state)
{
CARD32 data[2];
- TRACE ("entering setWmState");
+ TRACE ("window 0x%lx", w);
data[0] = state;
data[1] = None;
@@ -126,7 +126,7 @@ getMotifHints (DisplayInfo *display_info, Window w)
unsigned char *data;
PropMwmHints *result;
- TRACE ("entering getMotifHints");
+ TRACE ("window 0x%lx", w);
data = NULL;
result = NULL;
@@ -158,7 +158,7 @@ getWMProtocols (DisplayInfo *display_info, Window w)
unsigned long bytes_remain, nitems;
unsigned char *data;
- TRACE ("entering getWMProtocols");
+ TRACE ("window 0x%lx", w);
result = 0;
if (XGetWMProtocols (display_info->dpy, w, &protocols, &n))
@@ -232,7 +232,7 @@ getHint (DisplayInfo *display_info, Window w, int atom_id, long *value)
gboolean success;
g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
- TRACE ("entering getHint");
+ TRACE ("window 0x%lx atom %i", w, atom_id);
success = FALSE;
*value = 0;
@@ -256,7 +256,7 @@ void
setHint (DisplayInfo *display_info, Window w, int atom_id, long value)
{
g_return_if_fail ((atom_id >= 0) && (atom_id < ATOM_COUNT));
- TRACE ("entering setHint");
+ TRACE ("window 0x%lx atom %i", w, atom_id);
XChangeProperty (display_info->dpy, w, display_info->atoms[atom_id], XA_CARDINAL,
32, PropModeReplace, (unsigned char *) &value, 1);
@@ -273,8 +273,6 @@ getDesktopLayout (DisplayInfo *display_info, Window root, int ws_count, NetWmDes
int real_format;
gboolean success;
- TRACE ("entering getDesktopLayout");
-
ptr = NULL;
data = NULL;
success = FALSE;
@@ -451,7 +449,7 @@ getAtomList (DisplayInfo *display_info, Window w, int atom_id, Atom ** atoms_p,
*n_atoms_p = 0;
g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
- TRACE ("entering getAtomList()");
+ TRACE ("window 0x%lx atom %i", w, atom_id);
if ((XGetWindowProperty (display_info->dpy, w, display_info->atoms[atom_id],
0, G_MAXLONG, FALSE, XA_ATOM, &type, &format, &n_atoms,
@@ -492,7 +490,7 @@ getCardinalList (DisplayInfo *display_info, Window w, int atom_id, unsigned long
*n_cardinals_p = 0;
g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
- TRACE ("entering getCardinalList()");
+ TRACE ("window 0x%lx atom %i", w, atom_id);
if ((XGetWindowProperty (display_info->dpy, w, display_info->atoms[atom_id],
0, G_MAXLONG, FALSE, XA_CARDINAL,
@@ -524,7 +522,8 @@ setNetWorkarea (DisplayInfo *display_info, Window root, int nb_workspaces, int w
unsigned long *data, *ptr;
int i, j;
- TRACE ("entering setNetWorkarea");
+ TRACE ("workspaces %i [%i×%i]", nb_workspaces, width, height);
+
j = (nb_workspaces ? nb_workspaces : 1);
data = (unsigned long *) g_new0 (unsigned long, j * 4);
ptr = data;
@@ -545,7 +544,8 @@ setNetFrameExtents (DisplayInfo *display_info, Window w, int top, int left, int
{
unsigned long data[4] = { 0, 0, 0, 0 };
- TRACE ("entering setNetFrameExtents");
+ TRACE ("window 0x%lx [left=%i,right=%i,top=%i,bottom=%i]", w, left, right, top, bottom);
+
data[0] = (unsigned long) left;
data[1] = (unsigned long) right;
data[2] = (unsigned long) top;
@@ -559,7 +559,8 @@ setNetFullscreenMonitors (DisplayInfo *display_info, Window w, gint top, gint bo
{
unsigned long data[4] = { 0, 0, 0, 0 };
- TRACE ("entering setNetFullscreenMonitors");
+ TRACE ("window 0x%lx [top=%i,bottom=%i,left=%i,right=%i]", w, top, bottom, left, right);
+
data[0] = (unsigned long) top;;
data[1] = (unsigned long) bottom;
data[2] = (unsigned long) left;
@@ -573,7 +574,6 @@ getNetCurrentDesktop (DisplayInfo *display_info, Window root)
{
long ws;
- TRACE ("entering getNetCurrentDesktop");
getHint (display_info, root, NET_CURRENT_DESKTOP, &ws);
return (int) ws;
}
@@ -582,7 +582,8 @@ void
setNetCurrentDesktop (DisplayInfo *display_info, Window root, int workspace)
{
unsigned long data[2];
- TRACE ("entering setNetCurrentDesktop");
+
+ TRACE ("workspace %i", workspace);
data[0] = 0;
data[1] = 0;
@@ -597,7 +598,9 @@ void
setNetDesktopInfo (DisplayInfo *display_info, Window root, int workspace, int width, int height)
{
unsigned long data[2];
- TRACE ("entering setNetDesktopInfo");
+
+ TRACE ("workspace %i [%i×%i]", workspace, width, height);
+
data[0] = width;
data[1] = height;
XChangeProperty (display_info->dpy, root, display_info->atoms[NET_DESKTOP_GEOMETRY],
@@ -609,7 +612,8 @@ void
setUTF8StringHint (DisplayInfo *display_info, Window w, int atom_id, const gchar *val)
{
g_return_if_fail ((atom_id >= 0) && (atom_id < ATOM_COUNT));
- TRACE ("entering setUTF8StringHint");
+
+ TRACE ("window 0x%lx atom %i", w, atom_id);
XChangeProperty (display_info->dpy, w, display_info->atoms[atom_id],
display_info->atoms[UTF8_STRING], 8, PropModeReplace,
@@ -619,7 +623,7 @@ setUTF8StringHint (DisplayInfo *display_info, Window w, int atom_id, const gchar
void
getTransientFor (DisplayInfo *display_info, Window root, Window w, Window * transient_for)
{
- TRACE ("entering getTransientFor");
+ TRACE ("window 0x%lx", w);
if (XGetTransientForHint (display_info->dpy, w, transient_for))
{
@@ -639,7 +643,7 @@ getTransientFor (DisplayInfo *display_info, Window root, Window w, Window * tran
*transient_for = None;
}
- TRACE ("Window (0x%lx) is transient for (0x%lx)", w, *transient_for);
+ TRACE ("window (0x%lx) is transient for (0x%lx)", w, *transient_for);
}
static char *
@@ -649,8 +653,6 @@ text_property_to_utf8 (DisplayInfo *display_info, const XTextProperty * prop)
int count;
char *retval;
- TRACE ("entering text_property_to_utf8");
-
list = NULL;
count = gdk_text_property_to_utf8_list_for_display (display_info->gdisplay,
gdk_x11_xatom_to_atom (prop->encoding),
@@ -673,7 +675,8 @@ get_text_property (DisplayInfo *display_info, Window w, Atom a)
XTextProperty text;
char *retval;
- TRACE ("entering get_text_property");
+ TRACE ("window 0x%lx", w);
+
text.nitems = 0;
if (XGetTextProperty (display_info->dpy, w, &text, a))
{
@@ -706,8 +709,7 @@ getUTF8StringData (DisplayInfo *display_info, Window w, int atom_id, gchar **str
unsigned long n_items;
g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
-
- TRACE ("entering getUTF8StringData");
+ TRACE ("window 0x%lx atom %i", w, atom_id);
*str_p = NULL;
if ((XGetWindowProperty (display_info->dpy, w, display_info->atoms[atom_id],
@@ -740,8 +742,7 @@ getUTF8String (DisplayInfo *display_info, Window w, int atom_id, gchar **str_p,
char *xstr;
g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
-
- TRACE ("entering getUTF8String");
+ TRACE ("window 0x%lx atom id %i", w, atom_id);
if (!getUTF8StringData (display_info, w, atom_id, &xstr, length))
{
@@ -781,8 +782,7 @@ getUTF8StringList (DisplayInfo *display_info, Window w, int atom_id, gchar ***st
guint i, length;
g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
-
- TRACE ("entering getUTF8StringList");
+ TRACE ("window 0x%lx atom id %i", w, atom_id);
*str_p = NULL;
*n_items = 0;
@@ -838,10 +838,9 @@ getWindowProp (DisplayInfo *display_info, Window window, int atom_id, Window *w)
unsigned long bytes_after;
unsigned char *prop;
- TRACE ("entering getWindowProp");
-
g_return_val_if_fail (window != None, FALSE);
g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
+ TRACE ("window 0x%lx atom id %i", window, atom_id);
*w = None;
if (XGetWindowProperty (display_info->dpy, window, display_info->atoms[atom_id],
@@ -869,7 +868,7 @@ getWindowHostname (DisplayInfo *display_info, Window w, gchar **machine)
char *str;
gboolean status;
- TRACE ("entering getWindowHostname");
+ TRACE ("window 0x%lx", w);
g_return_val_if_fail (machine != NULL, FALSE);
*machine = NULL;
@@ -898,7 +897,7 @@ getWindowName (DisplayInfo *display_info, Window w, gchar **name)
guint len;
gboolean status;
- TRACE ("entering getWindowName");
+ TRACE ("window 0x%lx", w);
g_return_val_if_fail (name != NULL, FALSE);
*name = NULL;
@@ -925,11 +924,10 @@ getWindowRole (DisplayInfo *display_info, Window window, gchar **role)
{
XTextProperty tp;
- TRACE ("entering GetWindowRole");
-
g_return_val_if_fail (role != NULL, FALSE);
*role = NULL;
g_return_val_if_fail (window != None, FALSE);
+ TRACE ("window 0x%lx", window);
if (XGetTextProperty (display_info->dpy, window, &tp, display_info->atoms[WM_WINDOW_ROLE]))
{
@@ -952,9 +950,9 @@ Window
getClientLeader (DisplayInfo *display_info, Window window)
{
Window client_leader;
- TRACE ("entering getClientLeader");
g_return_val_if_fail (window != None, None);
+ TRACE ("window 0x%lx", window);
client_leader = None;
getWindowProp (display_info, window, WM_CLIENT_LEADER, &client_leader);
@@ -970,9 +968,8 @@ getNetWMUserTime (DisplayInfo *display_info, Window window, guint32 *timestamp)
unsigned long bytes_after;
unsigned char *data = NULL;
- TRACE ("entering getNetWMUserTime");
-
g_return_val_if_fail (window != None, FALSE);
+ TRACE ("window 0x%lx", window);
if (XGetWindowProperty (display_info->dpy, window, display_info->atoms[NET_WM_USER_TIME],
0L, 1L, FALSE, XA_CARDINAL, &actual_type, &actual_format, &nitems,
@@ -995,9 +992,9 @@ Window
getNetWMUserTimeWindow (DisplayInfo *display_info, Window window)
{
Window user_time_win;
- TRACE ("entering getNetWMUserTimeWindow");
g_return_val_if_fail (window != None, None);
+ TRACE ("window 0x%lx", window);
user_time_win = None;
if (getWindowProp (display_info, window, NET_WM_USER_TIME_WINDOW, &user_time_win))
@@ -1013,11 +1010,10 @@ getClientID (DisplayInfo *display_info, Window window, gchar **client_id)
Window id;
XTextProperty tp;
- TRACE ("entering getClientID");
-
g_return_val_if_fail (client_id != NULL, FALSE);
*client_id = NULL;
g_return_val_if_fail (window != None, FALSE);
+ TRACE ("window 0x%lx", window);
if (getWindowProp (display_info, window, WM_CLIENT_LEADER, &id) && (id != None))
{
@@ -1042,6 +1038,7 @@ getWindowCommand (DisplayInfo *display_info, Window window, char ***argv, int *a
*argc = 0;
g_return_val_if_fail (window != None, FALSE);
+ TRACE ("window 0x%lx", window);
if (XGetCommand (display_info->dpy, window, argv, argc) && (*argc > 0))
{
@@ -1067,6 +1064,8 @@ getKDEIcon (DisplayInfo *display_info, Window window, Pixmap * pixmap, Pixmap *
unsigned char *data;
Pixmap *icons;
+ TRACE ("window 0x%lx", window);
+
*pixmap = None;
*mask = None;
@@ -1102,6 +1101,8 @@ getRGBIconData (DisplayInfo *display_info, Window window, unsigned long **data,
int format;
unsigned long bytes_after;
+ TRACE ("window 0x%lx", window);
+
if (XGetWindowProperty (display_info->dpy, window, display_info->atoms[NET_WM_ICON],
0L, G_MAXLONG, FALSE, XA_CARDINAL, &type, &format, nitems,
&bytes_after, (unsigned char **) data) != Success)
@@ -1130,7 +1131,7 @@ getOpacity (DisplayInfo *display_info, Window window, guint32 *opacity)
g_return_val_if_fail (window != None, FALSE);
g_return_val_if_fail (opacity != NULL, FALSE);
- TRACE ("entering getOpacity");
+ TRACE ("window 0x%lx", window);
val = 0;
if (getHint (display_info, window, NET_WM_WINDOW_OPACITY, &val))
@@ -1148,7 +1149,7 @@ getOpacityLock (DisplayInfo *display_info, Window window)
long val;
g_return_val_if_fail (window != None, FALSE);
- TRACE ("entering getOpacityLock");
+ TRACE ("window 0x%lx", window);
/* only presence/absence matters */
return !!getHint (display_info, window, NET_WM_WINDOW_OPACITY_LOCKED, &val);
@@ -1162,6 +1163,7 @@ setXAtomManagerOwner (DisplayInfo *display_info, Atom atom, Window root, Window
int status;
g_return_val_if_fail (root != None, FALSE);
+ TRACE ("window 0x%lx", w);
server_time = myDisplayGetCurrentTime (display_info);
status = XSetSelectionOwner (display_info->dpy, atom, w, server_time);
@@ -1195,6 +1197,7 @@ gboolean
setAtomIdManagerOwner (DisplayInfo *display_info, int atom_id, Window root, Window w)
{
g_return_val_if_fail (((atom_id >= 0) && (atom_id < ATOM_COUNT)), FALSE);
+ TRACE ("atom %i", atom_id);
return setXAtomManagerOwner(display_info, display_info->atoms[atom_id], root, w);
}
@@ -1227,7 +1230,7 @@ getXServerTime (DisplayInfo *display_info)
screen_info = myDisplayGetDefaultScreen (display_info);
g_return_val_if_fail (screen_info, CurrentTime);
- TRACE ("getXServerTime: Using X server roundtrip");
+ TRACE ("using X server roundtrip");
updateXserverTime (display_info);
XWindowEvent (display_info->dpy, display_info->timestamp_win, PropertyChangeMask, &xevent);
event = xfwm_device_translate_event (display_info->devices, &xevent, NULL);
@@ -1235,7 +1238,7 @@ getXServerTime (DisplayInfo *display_info)
xfwm_device_free_event (event);
}
- TRACE ("getXServerTime gives timestamp=%u", (guint32) timestamp);
+ TRACE ("timestamp=%u", (guint32) timestamp);
return timestamp;
}
@@ -1250,8 +1253,8 @@ checkKdeSystrayWindow (DisplayInfo *display_info, Window window)
unsigned char *data;
Window trayIconForWindow;
- TRACE ("entering checkKdeSystrayWindow");
g_return_val_if_fail (window != None, FALSE);
+ TRACE ("window 0x%lx", window);
XGetWindowProperty(display_info->dpy, window, display_info->atoms[KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR],
0L, sizeof(Window), FALSE, XA_WINDOW, &actual_type, &actual_format,
@@ -1279,9 +1282,9 @@ sendSystrayReqDock(DisplayInfo *display_info, Window window, Window systray)
{
XClientMessageEvent xev;
- TRACE ("entering sendSystrayReqDock");
g_return_if_fail (window != None);
g_return_if_fail (systray != None);
+ TRACE ("window 0x%lx", window);
xev.type = ClientMessage;
xev.window = systray;
@@ -1301,14 +1304,14 @@ getSystrayWindow (DisplayInfo *display_info, Atom net_system_tray_selection)
{
Window systray_win;
- TRACE ("entering getSystrayWindow");
+ TRACE ("entering");
systray_win = XGetSelectionOwner (display_info->dpy, net_system_tray_selection);
if (systray_win)
{
XSelectInput (display_info->dpy, systray_win, StructureNotifyMask);
}
- TRACE ("New systray window: 0x%lx", systray_win);
+ TRACE ("new systray window: 0x%lx", systray_win);
return systray_win;
}
#endif
@@ -1320,11 +1323,10 @@ getWindowStartupId (DisplayInfo *display_info, Window w, gchar **startup_id)
char *str;
guint len;
- TRACE ("entering getWindowStartupId");
-
g_return_val_if_fail (startup_id != NULL, FALSE);
*startup_id = NULL;
g_return_val_if_fail (w != None, FALSE);
+ TRACE ("window 0x%lx", w);
if (getUTF8StringData (display_info, w, NET_STARTUP_ID, &str, &len))
{
diff --git a/src/keyboard.c b/src/keyboard.c
index a66fc46..362a901 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -124,7 +124,6 @@ parseKeyString (Display * dpy, MyKey * key, const char *str)
{
g_return_if_fail (key != NULL);
- TRACE ("entering parseKeyString");
TRACE ("key string=%s", str);
key->keycode = 0;
@@ -156,7 +155,7 @@ grabKey (XfwmDevices *devices, Display *dpy, MyKey *key, Window w)
{
int status;
- TRACE ("entering grabKey");
+ TRACE ("window 0x%lx", w);
status = GrabSuccess;
if (key->keycode)
@@ -206,7 +205,7 @@ grabKey (XfwmDevices *devices, Display *dpy, MyKey *key, Window w)
void
ungrabKeys (XfwmDevices *devices, Display *dpy, Window w)
{
- TRACE ("entering ungrabKeys");
+ TRACE ("window 0x%lx", w);
xfwm_device_ungrab_keycode (devices, dpy, AnyKey, AnyModifier, w);
}
@@ -216,7 +215,7 @@ grabButton (XfwmDevices *devices, Display *dpy, guint button, guint modifier, Wi
{
gboolean result;
- TRACE ("entering grabButton");
+ TRACE ("window 0x%lx", w);
result = TRUE;
if (modifier == AnyModifier)
@@ -269,9 +268,7 @@ grabButton (XfwmDevices *devices, Display *dpy, guint button, guint modifier, Wi
void
ungrabButton (XfwmDevices *devices, Display *dpy, guint button, guint modifier, Window w)
{
- TRACE ("entering ungrabKeys");
-
- TRACE ("entering grabButton");
+ TRACE ("window 0x%lx", w);
if (modifier == AnyModifier)
{
diff --git a/src/main.c b/src/main.c
index 442bcea..8a98f9c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -195,7 +195,7 @@ cleanUp (void)
GSList *screens;
DisplayInfo *display_info;
- TRACE ("entering cleanUp");
+ TRACE ("entering");
setupHandler (FALSE);
@@ -517,8 +517,6 @@ initialize (gint compositor_mode, gboolean replace_wm)
DisplayInfo *display_info;
gint i, nscreens, default_screen;
- TRACE ("entering initialize");
-
DBG ("xfwm4 starting, using GTK+-%d.%d.%d", gtk_major_version,
gtk_minor_version, gtk_micro_version);
diff --git a/src/menu.c b/src/menu.c
index 07f7fc5..899137c 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -146,14 +146,12 @@ activate_cb (GtkWidget * menuitem, gpointer data)
{
MenuData *menudata;
- TRACE ("entering activate_cb");
g_return_val_if_fail (GTK_IS_WIDGET (menuitem), FALSE);
+ TRACE ("entering");
menu_open = NULL;
-
menudata = data;
- TRACE ("deactivating menu_filter");
eventFilterPop (menudata->menu->filter_setup);
(*menudata->menu->func) (menudata->menu,
menudata->op,
@@ -168,10 +166,11 @@ menu_closed (GtkMenu * widget, gpointer data)
{
Menu *menu;
- TRACE ("entering menu_closed");
+ TRACE ("entering");
+
menu = data;
menu_open = NULL;
- TRACE ("deactivating menu_filter");
+
eventFilterPop (menu->filter_setup);
(*menu->func) (menu, 0, menu->xid, menu->data, NULL);
return (FALSE);
@@ -247,7 +246,8 @@ menu_default (GdkScreen *gscr, Window xid, MenuOp ops, MenuOp insensitive, MenuF
const gchar *label;
int i;
- TRACE ("entering menu_new");
+ TRACE ("entering");
+
menu = g_new (Menu, 1);
menu->func = func;
menu->filter_setup = filter_setup;
@@ -323,7 +323,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
static void
closure_notify (gpointer data, GClosure * closure)
{
- TRACE ("entering closure_notify");
+ TRACE ("entering");
+
if (data)
{
TRACE ("freeing data");
@@ -334,9 +335,10 @@ closure_notify (gpointer data, GClosure * closure)
GtkWidget *
menu_item_connect (GtkWidget * item, MenuData * item_data)
{
- TRACE ("entering menu_item_connect");
g_return_val_if_fail (item != NULL, NULL);
g_return_val_if_fail (GTK_IS_MENU_ITEM (item), NULL);
+ TRACE ("entering");
+
g_signal_connect_closure (G_OBJECT (item), "activate",
g_cclosure_new (G_CALLBACK (activate_cb), item_data,
(GClosureNotify) closure_notify), FALSE);
@@ -346,17 +348,17 @@ menu_item_connect (GtkWidget * item, MenuData * item_data)
gboolean
menu_is_opened (void)
{
- TRACE ("entering menu_is_opened");
+ TRACE ("entering");
return (menu_open != NULL);
}
gboolean
menu_check_and_close (void)
{
- TRACE ("entering menu_check_or_close");
+ TRACE ("entering");
if (menu_open)
{
- TRACE ("menu open, emitting deactivate signal");
+ TRACE ("emitting deactivate signal");
g_signal_emit_by_name (G_OBJECT (menu_open), "deactivate");
menu_open = NULL;
return (TRUE);
@@ -422,7 +424,7 @@ grab_available (GdkWindow *win, guint32 timestamp)
gboolean grab_failed;
gint i;
- TRACE ("entering grab_available");
+ TRACE ("entering");
pointer_mask = GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
@@ -469,7 +471,7 @@ menu_popup_event (Menu *menu, gint root_x, gint root_y, guint button, guint32 ti
GdkSeat *seat;
GdkDevice *device;
- TRACE ("entering menu_popup_event");
+ TRACE ("entering");
event = gtk_get_current_event ();
@@ -508,10 +510,9 @@ menu_popup (Menu *menu, gint root_x, gint root_y, guint button, guint32 timestam
GdkRectangle rectangle;
#endif
- TRACE ("entering menu_popup");
-
g_return_val_if_fail (menu != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU (menu->menu), FALSE);
+ TRACE ("entering");
pt = g_new (GdkPoint, 1);
pt->x = root_x;
@@ -524,7 +525,7 @@ menu_popup (Menu *menu, gint root_x, gint root_y, guint button, guint32 timestam
if (!grab_available (window, timestamp))
{
g_free (pt);
- TRACE ("Cannot get grab on pointer/keyboard, cancel.");
+ TRACE ("cannot get grab on pointer/keyboard, cancel.");
return FALSE;
}
TRACE ("opening new menu");
@@ -566,13 +567,11 @@ menu_popup (Menu *menu, gint root_x, gint root_y, guint button, guint32 timestam
void
menu_free (Menu * menu)
{
- TRACE ("entering menu_free");
-
g_return_if_fail (menu != NULL);
g_return_if_fail (menu->menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu->menu));
- TRACE ("freeing menu");
+ TRACE ("entering");
gtk_widget_destroy (menu->menu);
g_free (menu);
diff --git a/src/misc.c b/src/misc.c
index d28f9a6..94a6060 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -51,7 +51,7 @@ getMouseXY (ScreenInfo *screen_info, Window w, gint *x2, gint *y2)
guint mask;
gint x1, y1;
- TRACE ("entering getMouseXY");
+ TRACE ("window (0x%lx)", w);
XQueryPointer (myScreenGetXDisplay (screen_info), w, &w1, &w2, &x1, &y1, x2, y2, &mask);
return mask;
@@ -66,7 +66,6 @@ createGC (ScreenInfo *screen_info, char *col, int func, XFontStruct * font,
GC gc;
int mask;
- TRACE ("entering createGC");
TRACE ("color=%s", col);
mask = GCForeground | GCFunction;
@@ -99,7 +98,7 @@ sendClientMessage (ScreenInfo *screen_info, Window w, int atom_id, guint32 times
XClientMessageEvent ev;
g_return_if_fail ((atom_id > 0) && (atom_id < ATOM_COUNT));
- TRACE ("entering sendClientMessage");
+ TRACE ("atom %i, timestamp %u", atom_id, (unsigned int) timestamp);
display_info = screen_info->display_info;
ev.type = ClientMessage;
@@ -119,7 +118,7 @@ sendRootMessage (ScreenInfo *screen_info, int atom_id, long value, guint32 times
XClientMessageEvent ev;
g_return_if_fail ((atom_id > 0) && (atom_id < ATOM_COUNT));
- TRACE ("entering sendClientMessage");
+ TRACE ("atom %i, timestamp %u", atom_id, (unsigned int) timestamp);
display_info = screen_info->display_info;
ev.type = ClientMessage;
@@ -148,6 +147,7 @@ checkWindowOnRoot(ScreenInfo *screen_info, Window w)
g_return_val_if_fail (screen_info != NULL, FALSE);
g_return_val_if_fail (w != None, FALSE);
+ TRACE ("window 0x%lx", w);
display_info = screen_info->display_info;
wins = NULL;
@@ -179,6 +179,7 @@ placeSidewalks(ScreenInfo *screen_info, gboolean activate)
g_return_if_fail (MYWINDOW_XWINDOW (screen_info->sidewalk[1]) != None);
g_return_if_fail (MYWINDOW_XWINDOW (screen_info->sidewalk[2]) != None);
g_return_if_fail (MYWINDOW_XWINDOW (screen_info->sidewalk[3]) != None);
+ TRACE ("entering");
l = screen_info->desktop_layout;
if ((activate) && (l.cols > 1))
diff --git a/src/moveresize.c b/src/moveresize.c
index 21e1899..cbbda37 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -99,7 +99,7 @@ clientCheckSize (Client * c, int size, int base, int min, int max, int incr, gbo
int size_return;
g_return_val_if_fail (c != NULL, size);
- TRACE ("entering clientCheckSize");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
size_return = size;
@@ -149,8 +149,7 @@ int
clientCheckWidth (Client * c, int w, gboolean source_is_application)
{
g_return_val_if_fail (c != NULL, w);
- TRACE ("entering clientCheckWidth");
- TRACE ("setting width %i for client \"%s\" (0x%lx)", w, c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
return clientCheckSize (c, w,
c->size->base_width,
@@ -164,8 +163,7 @@ int
clientCheckHeight (Client * c, int h, gboolean source_is_application)
{
g_return_val_if_fail (c != NULL, h);
- TRACE ("entering clientCheckHeight");
- TRACE ("setting height %i for client \"%s\" (0x%lx)", h, c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
return clientCheckSize (c, h,
c->size->base_height,
@@ -269,7 +267,6 @@ clientConstrainRatio (Client * c, int handle)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientConstrainRatio");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (c->size->flags & PAspect)
@@ -345,7 +342,8 @@ clientConstrainRatio (Client * c, int handle)
static void
clientDrawOutline (Client * c)
{
- TRACE ("entering clientDrawOutline");
+ g_return_if_fail (c != NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
XDrawRectangle (clientGetXDisplay (c), c->screen_info->xroot, c->screen_info->box_gc, frameExtentX (c), frameExtentY (c),
frameExtentWidth (c) - 1, frameExtentHeight (c) - 1);
@@ -482,8 +480,7 @@ clientSnapPosition (Client * c, int prev_x, int prev_y)
GdkRectangle rect;
g_return_if_fail (c != NULL);
- TRACE ("entering clientSnapPosition");
- TRACE ("Snapping client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
best_delta_x = screen_info->params->snap_width + 1;
@@ -629,7 +626,7 @@ clientButtonReleaseFilter (XfwmEvent *event, gpointer data)
c = passdata->c;
screen_info = c->screen_info;
- TRACE ("entering clientButtonReleaseFilter");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if ((event->meta.type == XFWM_EVENT_BUTTON && !event->button.pressed &&
(passdata->button == AnyButton || passdata->button == event->button.button)) ||
@@ -658,7 +655,7 @@ clientMoveWarp (Client * c, ScreenInfo * screen_info, int * x_root, int * y_root
g_return_if_fail (screen_info != NULL);
g_return_if_fail (x_root != NULL);
g_return_if_fail (y_root != NULL);
- TRACE ("entering clientMoveWarp");
+ TRACE ("entering");
if ((c != NULL) && !(screen_info->params->wrap_windows))
{
@@ -882,7 +879,7 @@ clientMoveEventFilter (XfwmEvent *event, gpointer data)
unsigned long cancel_maximize_flags;
unsigned long cancel_restore_size_flags;
- TRACE ("entering clientMoveEventFilter");
+ TRACE ("entering");
c = passdata->c;
prev_x=c->x;
@@ -1122,7 +1119,7 @@ clientMoveEventFilter (XfwmEvent *event, gpointer data)
status = EVENT_FILTER_CONTINUE;
}
- TRACE ("leaving clientMoveEventFilter");
+ TRACE ("leaving");
if (!moving)
{
@@ -1145,7 +1142,7 @@ clientMove (Client * c, XfwmEventButton *event)
gboolean g1, g2;
g_return_if_fail (c != NULL);
- TRACE ("entering clientDoMove");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING) ||
!FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_MOVE))
@@ -1158,7 +1155,7 @@ clientMove (Client * c, XfwmEventButton *event)
return;
}
- TRACE ("moving client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -1391,7 +1388,7 @@ clientResizeEventFilter (XfwmEvent *event, gpointer data)
int right_edge; /* -Cliff */
int bottom_edge; /* -Cliff */
- TRACE ("entering clientResizeEventFilter");
+ TRACE ("entering");
passdata = (MoveResizeData *) data;
c = passdata->c;
@@ -1674,7 +1671,7 @@ clientResizeEventFilter (XfwmEvent *event, gpointer data)
status = EVENT_FILTER_CONTINUE;
}
- TRACE ("leaving clientResizeEventFilter");
+ TRACE ("leaving");
if (!resizing)
{
@@ -1696,7 +1693,7 @@ clientResize (Client * c, int handle, XfwmEventButton *event)
gboolean g1, g2;
g_return_if_fail (c != NULL);
- TRACE ("entering clientResize");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING))
{
@@ -1720,7 +1717,7 @@ clientResize (Client * c, int handle, XfwmEventButton *event)
screen_info = c->screen_info;
display_info = screen_info->display_info;
- TRACE ("resizing client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
passdata.c = c;
passdata.cancel_x = passdata.ox = c->x;
diff --git a/src/mypixmap.c b/src/mypixmap.c
index 99de89a..354d708 100644
--- a/src/mypixmap.c
+++ b/src/mypixmap.c
@@ -685,6 +685,8 @@ xpm_image_load (const char *filename, xfwmColorSymbol *color_sym)
int size;
FILE *f;
+ TRACE ("file %s", filename);
+
f = g_fopen (filename, "rb");
if (!f)
{
@@ -714,6 +716,8 @@ xfwmPixmapRefreshPict (xfwmPixmap * pm)
{
ScreenInfo * screen_info;
+ TRACE ("pixmap %p", pm);
+
screen_info = pm->screen_info;
if (!pm->pict_format)
{
@@ -810,6 +814,7 @@ xfwmPixmapDrawFromGdkPixbuf (xfwmPixmap * pm, GdkPixbuf *pixbuf)
g_return_val_if_fail (pm != NULL, FALSE);
g_return_val_if_fail (pm->pixmap != None, FALSE);
g_return_val_if_fail (pm->mask != None, FALSE);
+ TRACE ("pixmap %p", pm);
dest_pixmap = xfwmPixmapCreateSurface (pm, FALSE);
@@ -907,6 +912,7 @@ xfwmPixmapRenderGdkPixbuf (xfwmPixmap * pm, GdkPixbuf *pixbuf)
g_return_val_if_fail (pm->pixmap != None, FALSE);
g_return_val_if_fail (pm->mask != None, FALSE);
g_return_val_if_fail (pixbuf != NULL, FALSE);
+ TRACE ("pixmap %p", pm);
surface = xfwmPixmapCreateSurface (pm, FALSE);
@@ -949,11 +955,10 @@ xfwmPixmapLoad (ScreenInfo * screen_info, xfwmPixmap * pm, const gchar * dir, co
gchar *filexpm;
GdkPixbuf *pixbuf;
- TRACE ("entering xfwmPixmapLoad(%s)", file);
-
g_return_val_if_fail (pm != NULL, FALSE);
g_return_val_if_fail (dir != NULL, FALSE);
g_return_val_if_fail (file != NULL, FALSE);
+ TRACE ("pixmap %p, dir %s, file %s", pm, dir, file);
xfwmPixmapInit (screen_info, pm);
/*
@@ -995,8 +1000,8 @@ void
xfwmPixmapCreate (ScreenInfo * screen_info, xfwmPixmap * pm,
gint width, gint height)
{
- TRACE ("entering xfwmPixmapCreate, width=%i, height=%i", width, height);
g_return_if_fail (screen_info != NULL);
+ TRACE ("pixmap %p [%i×%i]", pm, width, height);
if ((width < 1) || (height < 1))
{
@@ -1023,6 +1028,8 @@ xfwmPixmapCreate (ScreenInfo * screen_info, xfwmPixmap * pm,
void
xfwmPixmapInit (ScreenInfo * screen_info, xfwmPixmap * pm)
{
+ TRACE ("pixmap %p", pm);
+
pm->screen_info = screen_info;
pm->pixmap = None;
pm->mask = None;
@@ -1039,7 +1046,7 @@ void
xfwmPixmapFree (xfwmPixmap * pm)
{
- TRACE ("entering xfwmPixmapFree");
+ TRACE ("pixmap %p", pm);
pm->width = 0;
pm->height = 0;
@@ -1065,7 +1072,7 @@ xfwmPixmapFree (xfwmPixmap * pm)
gboolean
xfwmPixmapNone (xfwmPixmap * pm)
{
- TRACE ("entering xfwmPixmapEmpty");
+ TRACE ("pixmap %p", pm);
g_return_val_if_fail (pm != NULL, FALSE);
return (pm->pixmap == None);
@@ -1079,7 +1086,7 @@ xfwmPixmapFillRectangle (Display *dpy, int screen, Pixmap pm, Drawable d,
GC gc;
unsigned long mask;
- TRACE ("entering fillRectangle");
+ TRACE ("(%i,%i) [%i×%i]", x, y, width, height);
if ((width < 1) || (height < 1))
{
@@ -1107,7 +1114,7 @@ void
xfwmPixmapFill (xfwmPixmap * src, xfwmPixmap * dst,
gint x, gint y, gint width, gint height)
{
- TRACE ("entering xfwmWindowFill");
+ TRACE ("src %p, dst %p, [%i×%i]", src, dst, width, height);
if ((width < 1) || (height < 1))
{
@@ -1129,7 +1136,7 @@ void
xfwmPixmapDuplicate (xfwmPixmap * src, xfwmPixmap * dst)
{
g_return_if_fail (src != NULL);
- TRACE ("entering xfwmPixmapDuplicate, width=%i, height=%i", src->width, src->height);
+ TRACE ("src %p, dst %p [%i×%i]", src, dst, src->width, src->height);
xfwmPixmapCreate (src->screen_info, dst, src->width, src->height);
xfwmPixmapFill (src, dst, 0, 0, src->width, src->height);
diff --git a/src/mywindow.c b/src/mywindow.c
index 819e4c5..8e836dc 100644
--- a/src/mywindow.c
+++ b/src/mywindow.c
@@ -95,7 +95,7 @@ xfwmWindowCreate (ScreenInfo * screen_info, Visual *visual, gint depth, Window p
XSetWindowAttributes attributes;
unsigned long valuemask;
- TRACE ("entering xfwmWindowCreate");
+ TRACE ("parent (0x%lx)", parent);
g_return_if_fail (screen_info != NULL);
@@ -111,7 +111,7 @@ xfwmWindowCreate (ScreenInfo * screen_info, Visual *visual, gint depth, Window p
InputOutput, CopyFromParent,
valuemask, &attributes);
- TRACE ("Created XID 0x%lx", win->window);
+ TRACE ("new XID (0x%lx)", win->window);
win->map = FALSE;
win->screen_info = screen_info;
@@ -134,7 +134,7 @@ xfwmWindowCreate (ScreenInfo * screen_info, Visual *visual, gint depth, Window p
void
xfwmWindowDelete (xfwmWindow * win)
{
- TRACE ("entering xfwmWindowDelete");
+ TRACE ("win %p (0x%lx)", win, win->window);
if (win->window != None)
{
@@ -149,7 +149,7 @@ void
xfwmWindowShow (xfwmWindow * win, int x, int y, int width, int height,
gboolean refresh)
{
- TRACE ("entering xfwmWindowShow");
+ TRACE ("win %p (0x%lx) at (%i,%i) [%i×%i]", win, win->window, x, y, width, height);
if (!(win->window))
{
@@ -166,7 +166,7 @@ xfwmWindowShow (xfwmWindow * win, int x, int y, int width, int height,
win->window);
win->map = TRUE;
}
- TRACE ("Showing XID 0x%lx", win->window);
+
if (((x != win->x) || (y != win->y)) && ((width != win->width)
|| (height != win->height)))
{
@@ -211,7 +211,7 @@ xfwmWindowShow (xfwmWindow * win, int x, int y, int width, int height,
void
xfwmWindowHide (xfwmWindow * win)
{
- TRACE ("entering xfwmWindowHide");
+ TRACE ("win %p (0x%lx)", win, win->window);
if (win->map)
{
@@ -289,13 +289,13 @@ xfwmWindowCopyComposite (xfwmWindow * win, xfwmPixmap * pix)
if (!pix->pict)
{
- TRACE ("xfwmWindowCopyComposite: Pixmap picture does not exist");
+ TRACE ("pixmap picture does not exist");
return FALSE;
}
if (!win->pict_format)
{
- TRACE ("xfwmWindowCopyComposite: Window picture format is unknown");
+ TRACE ("window picture format is unknown");
return FALSE;
}
diff --git a/src/netwm.c b/src/netwm.c
index 501e251..e8011c3 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -57,7 +57,6 @@ clientSetNetState (Client * c)
int i;
g_return_if_fail (c != NULL);
- TRACE ("entering clientSetNetState");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -66,73 +65,73 @@ clientSetNetState (Client * c)
i = 0;
if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
{
- TRACE ("clientSetNetState : shaded");
+ TRACE ("shaded");
data[i++] = display_info->atoms[NET_WM_STATE_SHADED];
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
{
- TRACE ("clientSetNetState : sticky");
+ TRACE ("sticky");
data[i++] = display_info->atoms[NET_WM_STATE_STICKY];
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_STATE_MODAL))
{
- TRACE ("clientSetNetState : modal");
+ TRACE ("modal");
data[i++] = display_info->atoms[NET_WM_STATE_MODAL];
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_SKIP_PAGER))
{
- TRACE ("clientSetNetState : skip_pager");
+ TRACE ("skip_pager");
data[i++] = display_info->atoms[NET_WM_STATE_SKIP_PAGER];
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_SKIP_TASKBAR))
{
- TRACE ("clientSetNetState : skip_taskbar");
+ TRACE ("skip_taskbar");
data[i++] = display_info->atoms[NET_WM_STATE_SKIP_TASKBAR];
}
if (FLAG_TEST_ALL (c->flags, CLIENT_FLAG_MAXIMIZED))
{
- TRACE ("clientSetNetState : maximize vert + horiz");
+ TRACE ("maximize vert + horiz");
data[i++] = display_info->atoms[NET_WM_STATE_MAXIMIZED_HORZ];
data[i++] = display_info->atoms[NET_WM_STATE_MAXIMIZED_VERT];
}
else if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ))
{
- TRACE ("clientSetNetState : maximize horiz");
+ TRACE ("maximize horiz");
data[i++] = display_info->atoms[NET_WM_STATE_MAXIMIZED_HORZ];
}
else if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT))
{
- TRACE ("clientSetNetState : vert");
+ TRACE ("vert");
data[i++] = display_info->atoms[NET_WM_STATE_MAXIMIZED_VERT];
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_FULLSCREEN))
{
- TRACE ("clientSetNetState : fullscreen");
+ TRACE ("fullscreen");
data[i++] = display_info->atoms[NET_WM_STATE_FULLSCREEN];
}
else if (FLAG_TEST (c->flags, CLIENT_FLAG_ABOVE))
{
- TRACE ("clientSetNetState : above");
+ TRACE ("above");
data[i++] = display_info->atoms[NET_WM_STATE_ABOVE];
}
else if (FLAG_TEST (c->flags, CLIENT_FLAG_BELOW))
{
- TRACE ("clientSetNetState : below");
+ TRACE ("below");
data[i++] = display_info->atoms[NET_WM_STATE_BELOW];
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_ICONIFIED))
{
- TRACE ("clientSetNetState : hidden");
+ TRACE ("hidden");
data[i++] = display_info->atoms[NET_WM_STATE_HIDDEN];
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION))
{
- TRACE ("clientSetNetState : demands_attention");
+ TRACE ("demands_attention");
data[i++] = display_info->atoms[NET_WM_STATE_DEMANDS_ATTENTION];
}
if (c == clientGetFocus () || c->type & WINDOW_TYPE_STATE_FOCUSED)
{
- TRACE ("clientSetNetState : focused");
+ TRACE ("focused");
data[i++] = display_info->atoms[NET_WM_STATE_FOCUSED];
}
XChangeProperty (display_info->dpy, c->window,
@@ -149,7 +148,6 @@ clientGetNetState (Client * c)
Atom *atoms;
g_return_if_fail (c != NULL);
- TRACE ("entering clientGetNetState");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -161,22 +159,22 @@ clientGetNetState (Client * c)
{
if (FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
{
- TRACE ("clientGetNetState : shaded from session management");
+ TRACE ("shaded from session management");
FLAG_SET (c->flags, CLIENT_FLAG_SHADED);
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
{
- TRACE ("clientGetNetState : sticky from session management");
+ TRACE ("sticky from session management");
FLAG_SET (c->flags, CLIENT_FLAG_STICKY);
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ))
{
- TRACE ("clientGetNetState : maximized horiz from session management");
+ TRACE ("maximized horiz from session management");
FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ | CLIENT_FLAG_RESTORE_SIZE_POS);
}
if (FLAG_TEST (c->flags, CLIENT_FLAG_MAXIMIZED_VERT))
{
- TRACE ("clientGetNetState : maximized vert from session management");
+ TRACE ("maximized vert from session management");
FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED_VERT | CLIENT_FLAG_RESTORE_SIZE_POS);
}
}
@@ -184,36 +182,36 @@ clientGetNetState (Client * c)
if (getAtomList (display_info, c->window, NET_WM_STATE, &atoms, &n_atoms))
{
int i;
- TRACE ("clientGetNetState: %i atoms detected", n_atoms);
+ TRACE ("%i atoms detected", n_atoms);
i = 0;
while (i < n_atoms)
{
if (atoms[i] == display_info->atoms[NET_WM_STATE_SHADED])
{
- TRACE ("clientGetNetState : shaded");
+ TRACE ("shaded");
FLAG_SET (c->flags, CLIENT_FLAG_SHADED);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_STICKY])
{
- TRACE ("clientGetNetState : sticky");
+ TRACE ("sticky");
FLAG_SET (c->flags, CLIENT_FLAG_STICKY);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_MAXIMIZED_HORZ])
{
- TRACE ("clientGetNetState : maximized horiz");
+ TRACE ("maximized horiz");
FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED_HORIZ | CLIENT_FLAG_RESTORE_SIZE_POS);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_MAXIMIZED_VERT])
{
- TRACE ("clientGetNetState : maximized vert");
+ TRACE ("maximized vert");
FLAG_SET (c->flags, CLIENT_FLAG_MAXIMIZED_VERT | CLIENT_FLAG_RESTORE_SIZE_POS);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_FULLSCREEN])
{
if (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_ABOVE | CLIENT_FLAG_BELOW))
{
- TRACE ("clientGetNetState : fullscreen");
+ TRACE ("fullscreen");
FLAG_SET (c->flags, CLIENT_FLAG_FULLSCREEN);
}
}
@@ -221,7 +219,7 @@ clientGetNetState (Client * c)
{
if (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_FULLSCREEN | CLIENT_FLAG_BELOW))
{
- TRACE ("clientGetNetState : above");
+ TRACE ("above");
FLAG_SET (c->flags, CLIENT_FLAG_ABOVE);
}
}
@@ -229,44 +227,44 @@ clientGetNetState (Client * c)
{
if (!FLAG_TEST_ALL (c->flags, CLIENT_FLAG_ABOVE | CLIENT_FLAG_FULLSCREEN))
{
- TRACE ("clientGetNetState : below");
+ TRACE ("below");
FLAG_SET (c->flags, CLIENT_FLAG_BELOW);
}
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_MODAL])
{
- TRACE ("clientGetNetState : modal");
+ TRACE ("modal");
FLAG_SET (c->flags, CLIENT_FLAG_STATE_MODAL);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_SKIP_PAGER])
{
- TRACE ("clientGetNetState : skip_pager");
+ TRACE ("skip_pager");
FLAG_SET (c->flags, CLIENT_FLAG_SKIP_PAGER);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_SKIP_TASKBAR])
{
- TRACE ("clientGetNetState : skip_taskbar");
+ TRACE ("skip_taskbar");
FLAG_SET (c->flags, CLIENT_FLAG_SKIP_TASKBAR);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_HIDDEN])
{
- TRACE ("clientGetNetState : state_hidden");
+ TRACE ("state_hidden");
FLAG_SET (c->flags, CLIENT_FLAG_ICONIFIED);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_DEMANDS_ATTENTION])
{
- TRACE ("clientGetNetState : demands_attention");
+ TRACE ("demands_attention");
FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
}
else if (atoms[i] == display_info->atoms[NET_WM_STATE_FOCUSED])
{
- TRACE ("clientGetNetState : focused, ignored...");
+ TRACE ("focused, ignored...");
}
else
{
gchar *atom_name;
atom_name = get_atom_name (display_info, atoms[i]);
- g_warning ("Unmanaged net_wm_state (window 0x%lx, atom \"%s\")", c->window, atom_name);
+ g_warning ("unmanaged net_wm_state (window 0x%lx, atom \"%s\")", c->window, atom_name);
g_free (atom_name);
}
@@ -285,7 +283,6 @@ clientUpdateNetWmDesktop (Client * c, XClientMessageEvent * ev)
ScreenInfo *screen_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientUpdateNetWmDesktop");
TRACE ("client \"%s\" (0x%lx), value 0x%lx", c->name, c->window, ev->data.l[0]);
screen_info = c->screen_info;
@@ -312,7 +309,7 @@ clientUpdateNetWmDesktop (Client * c, XClientMessageEvent * ev)
}
else
{
- TRACE ("Ignoring invalid NET_WM_DESKTOP value 0x%lx specified for client \"%s\" (0x%lx)", ev->data.l[0], c->name, c->window);
+ TRACE ("invalid NET_WM_DESKTOP value 0x%lx specified for client \"%s\" (0x%lx)", ev->data.l[0], c->name, c->window);
}
}
@@ -326,7 +323,6 @@ clientUpdateNetState (Client * c, XClientMessageEvent * ev)
Atom second;
g_return_if_fail (c != NULL);
- TRACE ("entering clientUpdateNetState");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -605,7 +601,6 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev)
XfwmEvent *event;
g_return_if_fail (c != NULL);
- TRACE ("entering clientNetMoveResize");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -724,7 +719,6 @@ clientNetMoveResizeWindow (Client * c, XClientMessageEvent * ev)
int gravity;
g_return_if_fail (c != NULL);
- TRACE ("entering clientNetMoveResizeWindow");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING))
@@ -757,7 +751,6 @@ clientUpdateFullscreenState (Client * c)
int layer;
g_return_if_fail (c != NULL);
- TRACE ("entering clientUpdateFullscreenState");
TRACE ("Update fullscreen state for client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -799,7 +792,6 @@ clientGetNetWmType (Client * c)
int i;
g_return_if_fail (c != NULL);
- TRACE ("entering clientGetNetWmType");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -867,7 +859,6 @@ clientGetInitialNetWmDesktop (Client * c)
long val;
g_return_if_fail (c != NULL);
- TRACE ("entering clientGetInitialNetWmDesktop");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -942,7 +933,7 @@ clientSetNetClientList (ScreenInfo * screen_info, Atom a, GList * list)
GList *index_src;
gint size, i;
- TRACE ("entering clientSetNetClientList");
+ TRACE ("entering");
size = g_list_length (list);
if (size < 1)
@@ -974,7 +965,7 @@ clientValidateNetStrut (Client * c)
gboolean valid;
g_return_val_if_fail (c != NULL, TRUE);
- TRACE ("entering clientValidateNetStrut for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
valid = TRUE;
@@ -1020,7 +1011,7 @@ clientGetNetStruts (Client * c)
int i;
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientGetNetStruts for \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -1141,7 +1132,7 @@ clientSetNetActions (Client * c)
int i;
g_return_if_fail (c != NULL);
- TRACE ("entering clientSetNetActions");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -1196,8 +1187,7 @@ clientWindowType (Client * c)
netWindowType old_type;
g_return_if_fail (c != NULL);
- TRACE ("entering clientWindowType");
- TRACE ("type for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -1267,7 +1257,7 @@ clientWindowType (Client * c)
/* Treat DIALOG without transient_for set as transient for group */
if ((c->transient_for == None) || (!clientGetTransient (c)))
{
- TRACE ("Invalid transient 0x%lx specified for dialog window 0x%lx (%s)",
+ TRACE ("invalid transient 0x%lx specified for dialog window 0x%lx (%s)",
c->transient_for, c->window, c->name);
c->transient_for = c->screen_info->xroot;
}
@@ -1288,7 +1278,7 @@ clientWindowType (Client * c)
/* Treat UTILITY without transient_for set as transient for group */
if ((c->transient_for == None) || (!clientGetTransient (c)))
{
- TRACE ("Invalid transient 0x%lx specified for utility window 0x%lx (%s)",
+ TRACE ("invalid transient 0x%lx specified for utility window 0x%lx (%s)",
c->transient_for, c->window, c->name);
c->transient_for = c->screen_info->xroot;
}
@@ -1329,13 +1319,13 @@ clientWindowType (Client * c)
{
Client *c2;
- TRACE ("Window \"%s\" is a transient or a modal", c->name);
+ TRACE ("client \"%s\" is a transient or a modal", c->name);
c2 = clientGetHighestTransientOrModalFor (c);
if ((c2) && (c->initial_layer < c2->win_layer))
{
c->initial_layer = c2->win_layer;
- TRACE ("Applied layer is %lu", c->initial_layer);
+ TRACE ("applied layer is %lu", c->initial_layer);
}
FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_HAS_HIDE);
}
@@ -1356,8 +1346,7 @@ clientUpdateLayerState (Client * c)
int layer;
g_return_if_fail (c != NULL);
- TRACE ("entering clientUpdateLayerState");
- TRACE ("Update layer state for client \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->flags, CLIENT_FLAG_ABOVE))
{
@@ -1382,7 +1371,7 @@ clientSetNetActiveWindow (ScreenInfo *screen_info, Client *c, guint32 timestamp)
unsigned long data[2];
g_return_if_fail (screen_info != NULL);
- TRACE ("entering clientSetNetActiveWindow");
+ TRACE ("entering");
display_info = screen_info->display_info;
data[0] = (unsigned long) None;
@@ -1404,28 +1393,28 @@ clientHandleNetActiveWindow (Client *c, guint32 timestamp, gboolean source_is_ap
Client *focused;
g_return_if_fail (c != NULL);
- TRACE ("entering clientHandleNetActiveWindow");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
ev_time = myDisplayGetTime (display_info, timestamp);
if (!source_is_application && (timestamp == 0))
{
- TRACE ("Client \"%s\" (0x%lx) sent a NET_ACTIVE_WINDOW message with a timestamp of 0", c->name, c->window);
+ TRACE ("client \"%s\" (0x%lx) sent a NET_ACTIVE_WINDOW message with a timestamp of 0", c->name, c->window);
source_is_application = TRUE;
}
if (source_is_application)
{
current_time = myDisplayGetLastUserTime (display_info);
- TRACE ("Time of event received is %u, current XServer time is %u", (guint32) ev_time, (guint32) current_time);
+ TRACE ("time of event received is %u, current XServer time is %u", (guint32) ev_time, (guint32) current_time);
if ((screen_info->params->prevent_focus_stealing) && TIMESTAMP_IS_BEFORE((guint32) ev_time, (guint32) current_time))
{
focused = clientGetFocus ();
/* We do not want to set the demand attention flag if the window is focused though */
if (c != focused)
{
- TRACE ("Setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
+ TRACE ("setting WM_STATE_DEMANDS_ATTENTION flag on \"%s\" (0x%lx)", c->name, c->window);
FLAG_SET (c->flags, CLIENT_FLAG_DEMANDS_ATTENTION);
clientSetNetState (c);
}
@@ -1447,13 +1436,13 @@ ping_timeout_cb (gpointer data)
{
Client *c;
- TRACE ("entering ping_timeout_cb");
+ TRACE ("entering");
c = (Client *) data;
if (c)
{
c->ping_timeout_id = 0;
- TRACE ("Ping timeout on client \"%s\"", c->name);
+ TRACE ("ping timeout on client \"%s\"", c->name);
terminateShowDialog (c);
}
return (FALSE);
@@ -1464,7 +1453,7 @@ clientRemoveNetWMPing (Client *c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientSendNetWMPing");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (c->ping_timeout_id)
{
@@ -1483,7 +1472,7 @@ clientReceiveNetWMPong (ScreenInfo *screen_info, guint32 timestamp)
g_return_if_fail (screen_info != NULL);
g_return_if_fail (timestamp != CurrentTime);
- TRACE ("entering clientReceiveNetWMPong, timestamp %u", (unsigned int) timestamp);
+ TRACE ("timestamp %u", (unsigned int) timestamp);
for (c = screen_info->clients, i = 0; i < screen_info->client_count; c = c->next, i++)
{
@@ -1502,7 +1491,7 @@ clientSendNetWMPing (Client *c, guint32 timestamp)
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientSendNetWMPing");
+ TRACE ("client \"%s\" (0x%lx) timestamp %u", c->name, c->window, (unsigned int) timestamp);
if (!FLAG_TEST (c->wm_flags, WM_FLAG_PING))
{
@@ -1535,6 +1524,8 @@ clientGetUserTime (Client * c)
g_return_val_if_fail (c != NULL, FALSE);
g_return_val_if_fail (c->window != None, FALSE);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -1570,6 +1561,8 @@ clientAddUserTimeWin (Client * c)
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -1588,6 +1581,8 @@ clientRemoveUserTimeWin (Client * c)
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
screen_info = c->screen_info;
display_info = screen_info->display_info;
diff --git a/src/parserc.c b/src/parserc.c
index 150d8cc..21d464c 100644
--- a/src/parserc.c
+++ b/src/parserc.c
@@ -48,7 +48,7 @@ parseRc (const gchar * file, const gchar * dir, Settings *rc)
gchar *filename, *lvalue, *rvalue;
FILE *fp;
- TRACE ("entering parseRc");
+ TRACE ("file \"%s\" dir \"%s\"", file, dir);
g_return_val_if_fail (file != NULL, FALSE);
@@ -87,7 +87,7 @@ checkRc (Settings *rc)
gint i;
gboolean rval;
- TRACE ("entering checkRc");
+ TRACE ("entering");
rval = TRUE;
for (i = 0; rc[i].option; i++)
@@ -106,10 +106,10 @@ getGValue (const gchar * option, Settings *rc)
{
gint i;
- TRACE ("entering getValue");
-
g_return_val_if_fail (option != NULL, NULL);
+ TRACE ("option \"%s\"", option);
+
for (i = 0; rc[i].option; i++)
{
if (!g_ascii_strcasecmp (option, rc[i].option))
@@ -130,6 +130,8 @@ setValue (const gchar * lvalue, const gchar *rvalue, Settings *rc)
g_return_val_if_fail (lvalue != NULL, FALSE);
g_return_val_if_fail (rvalue != NULL, FALSE);
+ TRACE ("lvalue \"%s\" rvalue \"%s\"", lvalue, rvalue);
+
for (i = 0; rc[i].option; i++)
{
if (!g_ascii_strcasecmp (lvalue, rc[i].option))
@@ -160,11 +162,11 @@ setGValue (const gchar * lvalue, const GValue *rvalue, Settings *rc)
{
gint i;
- TRACE ("entering setValue");
-
g_return_val_if_fail (lvalue != NULL, FALSE);
g_return_val_if_fail (rvalue != NULL, FALSE);
+ TRACE ("lvalue \"%s\"", lvalue);
+
for (i = 0; rc[i].option; i++)
{
if (!g_ascii_strcasecmp (lvalue, rc[i].option))
@@ -272,7 +274,7 @@ freeRc (Settings *rc)
{
gint i;
- TRACE ("entering freeRc");
+ TRACE ("entering");
for (i = 0; rc[i].option; i++)
{
@@ -290,10 +292,10 @@ getStringValue (const gchar *option, Settings *rc)
{
gint i;
- TRACE ("entering getStringValue");
-
g_return_val_if_fail (option != NULL, NULL);
+ TRACE ("option \"%s\"", option);
+
for (i = 0; rc[i].option; i++)
{
if (!g_ascii_strcasecmp (option, rc[i].option))
@@ -316,10 +318,10 @@ getIntValue (const gchar *option, Settings *rc)
{
gint i;
- TRACE ("entering getIntValue");
-
g_return_val_if_fail (option != NULL, 0);
+ TRACE ("option \"%s\"", option);
+
for (i = 0; rc[i].option; i++)
{
if (!g_ascii_strcasecmp (option, rc[i].option))
@@ -342,10 +344,10 @@ getBoolValue (const gchar *option, Settings *rc)
{
gint i;
- TRACE ("entering getBoolValue");
-
g_return_val_if_fail (option != NULL, FALSE);
+ TRACE ("option \"%s\"", option);
+
for (i = 0; rc[i].option; i++)
{
if (!g_ascii_strcasecmp (option, rc[i].option))
diff --git a/src/placement.c b/src/placement.c
index a265229..a643ef0 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -93,7 +93,7 @@ strutsToRectangles (Client *c,
ScreenInfo *screen_info;
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering strut_to_rectangle");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -161,7 +161,7 @@ checkValidStruts (GdkRectangle *struts,
return (intersect.height < MAX_VALID_STRUT(monitor->height));
break;
default:
- TRACE ("Unhandled strut side");
+ TRACE ("unhandled strut side");
break;
}
}
@@ -254,9 +254,9 @@ clientConstrainPos (Client * c, gboolean show_full)
gint min_visible;
g_return_val_if_fail (c != NULL, 0);
- TRACE ("entering clientConstrainPos %s",
+
+ TRACE ("client \"%s\" (0x%lx) %s", c->name, c->window,
show_full ? "(with show full)" : "(w/out show full)");
- TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -477,7 +477,6 @@ clientKeepVisible (Client * c, gint n_monitors, GdkRectangle *monitor_rect)
int diff_x, diff_y;
g_return_if_fail (c != NULL);
- TRACE ("entering clientKeepVisible");
TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
centered = FALSE;
@@ -554,7 +553,8 @@ smartPlacement (Client * c, int full_x, int full_y, int full_w, int full_h)
gint xmin, ymin;
g_return_if_fail (c != NULL);
- TRACE ("entering smartPlacement");
+
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
frame_height = frameExtentHeight (c);
@@ -727,7 +727,8 @@ static void
centerPlacement (Client * c, int full_x, int full_y, int full_w, int full_h)
{
g_return_if_fail (c != NULL);
- TRACE ("entering centerPlacement");
+
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
c->x = MAX (full_x + frameExtentLeft(c) + (full_w - frameExtentWidth(c)) / 2, full_x + frameExtentLeft(c));
c->y = MAX (full_y + frameExtentTop(c) + (full_h - frameExtentHeight(c)) / 2, full_y + frameExtentTop(c));
@@ -737,7 +738,8 @@ static void
mousePlacement (Client * c, int full_x, int full_y, int full_w, int full_h, int mx, int my)
{
g_return_if_fail (c != NULL);
- TRACE ("entering mousePlacement");
+
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
c->x = mx + frameExtentLeft(c) - frameExtentWidth(c) / 2;
c->y = my + frameExtentTop(c) - frameExtentHeight(c) / 2;
@@ -762,7 +764,8 @@ clientInitPosition (Client * c)
gboolean is_transient;
g_return_if_fail (c != NULL);
- TRACE ("entering clientInitPosition");
+
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
msx = 0;
@@ -865,7 +868,8 @@ clientFill (Client * c, int fill_type)
gint tmp_x, tmp_y, tmp_w, tmp_h;
g_return_if_fail (c != NULL);
- TRACE ("entering clientFill");
+
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!CLIENT_CAN_FILL_WINDOW (c))
{
@@ -1045,7 +1049,7 @@ clientFill (Client * c, int fill_type)
wc.height -= MAX (full_h - (frameExtentY(south_neighbour) - full_y), 0);
}
- TRACE ("Fill size request: (%d,%d) %dx%d", wc.x, wc.y, wc.width, wc.height);
+ TRACE ("fill size request: (%d,%d) %dx%d", wc.x, wc.y, wc.width, wc.height);
if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MANAGED))
{
clientConfigure(c, &wc, mask, NO_CFG_FLAG);
diff --git a/src/screen.c b/src/screen.c
index 6ae010c..75d49c0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -63,7 +63,8 @@ myScreenCheckWMAtom (ScreenInfo *screen_info, Atom atom)
gchar selection[32];
Atom wm_sn_atom;
- TRACE ("entering myScreenCheckWMAtom");
+ TRACE ("atom %lu", atom);
+
g_snprintf (selection, sizeof (selection), "WM_S%d", screen_info->screen);
wm_sn_atom = XInternAtom (myScreenGetXDisplay (screen_info), selection, FALSE);
@@ -87,7 +88,7 @@ myScreenSetWMAtom (ScreenInfo *screen_info, gboolean replace_wm)
g_return_val_if_fail (screen_info, FALSE);
g_return_val_if_fail (screen_info->display_info, FALSE);
- TRACE ("entering myScreenReplaceWM");
+ TRACE ("replace %i", replace_wm);
display_info = screen_info->display_info;
g_snprintf (selection, sizeof (selection), "WM_S%d", screen_info->screen);
@@ -183,7 +184,7 @@ myScreenInit (DisplayInfo *display_info, GdkScreen *gscr, unsigned long event_ma
g_return_val_if_fail (display_info, NULL);
g_return_val_if_fail (GDK_IS_SCREEN (gscr), NULL);
- TRACE ("entering myScreenInit");
+ TRACE ("entering");
screen_info = g_new0 (ScreenInfo, 1);
screen_info->params = g_new0 (XfwmParams, 1);
@@ -355,7 +356,7 @@ myScreenClose (ScreenInfo *screen_info)
DisplayInfo *display_info;
g_return_val_if_fail (screen_info, NULL);
- TRACE ("entering myScreenClose");
+ TRACE ("entering");
display_info = screen_info->display_info;
@@ -410,8 +411,7 @@ myScreenGetXDisplay (ScreenInfo *screen_info)
g_return_val_if_fail (screen_info, NULL);
g_return_val_if_fail (screen_info->display_info, NULL);
- TRACE ("entering myScreenGetXDisplay");
-
+
display_info = screen_info->display_info;
return display_info->dpy;
}
@@ -420,7 +420,6 @@ GtkWidget *
myScreenGetGtkWidget (ScreenInfo *screen_info)
{
g_return_val_if_fail (screen_info, NULL);
- TRACE ("entering myScreenGetGtkWidget");
return screen_info->gtk_win;
}
@@ -429,7 +428,6 @@ GdkWindow *
myScreenGetGdkWindow (ScreenInfo *screen_info)
{
g_return_val_if_fail (screen_info, NULL);
- TRACE ("entering myScreenGetGdkWindow");
return gtk_widget_get_window (screen_info->gtk_win);
}
@@ -441,7 +439,7 @@ myScreenGrabKeyboard (ScreenInfo *screen_info, guint event_mask, guint32 timesta
g_return_val_if_fail (screen_info, FALSE);
- TRACE ("entering myScreenGrabKeyboard");
+ TRACE ("timestamp %u", (unsigned int) timestamp);
grab = TRUE;
if (screen_info->key_grabs == 0)
@@ -465,7 +463,7 @@ myScreenGrabPointer (ScreenInfo *screen_info, gboolean owner_events,
gboolean grab;
g_return_val_if_fail (screen_info, FALSE);
- TRACE ("entering myScreenGrabPointer");
+ TRACE ("timestamp %u", (unsigned int) timestamp);
grab = TRUE;
if (screen_info->pointer_grabs == 0)
@@ -489,7 +487,7 @@ myScreenChangeGrabPointer (ScreenInfo *screen_info, gboolean owner_events,
gboolean grab;
g_return_val_if_fail (screen_info, FALSE);
- TRACE ("entering myScreenChangeGrabPointer");
+ TRACE ("timestamp %u", (unsigned int) timestamp);
grab = FALSE;
if (screen_info->pointer_grabs > 0)
@@ -516,7 +514,7 @@ unsigned int
myScreenUngrabKeyboard (ScreenInfo *screen_info, guint32 timestamp)
{
g_return_val_if_fail (screen_info, 0);
- TRACE ("entering myScreenUngrabKeyboard");
+ TRACE ("timestamp %u", (unsigned int) timestamp);
screen_info->key_grabs--;
if (screen_info->key_grabs < 0)
@@ -538,7 +536,7 @@ unsigned int
myScreenUngrabPointer (ScreenInfo *screen_info, guint32 timestamp)
{
g_return_val_if_fail (screen_info, 0);
- TRACE ("entering myScreenUngrabPointer");
+ TRACE ("timestamp %u", (unsigned int) timestamp);
screen_info->pointer_grabs--;
if (screen_info->pointer_grabs < 0)
@@ -562,7 +560,6 @@ myScreenGrabKeys (ScreenInfo *screen_info)
Display *dpy;
int i;
- TRACE ("entering myScreenUnrabKeys");
g_return_if_fail (screen_info != NULL);
dpy = myScreenGetXDisplay (screen_info);
@@ -579,7 +576,6 @@ myScreenUngrabKeys (ScreenInfo *screen_info)
{
Display *dpy;
- TRACE ("entering myScreenUnrabKeys");
g_return_if_fail (screen_info != NULL);
dpy = myScreenGetXDisplay (screen_info);
@@ -592,8 +588,6 @@ myScreenGetKeyPressed (ScreenInfo *screen_info, XfwmEventKey *event)
gint key;
guint state;
- TRACE ("entering myScreenGetKeyPressed");
-
state = event->state & MODIFIER_MASK;
for (key = 0; key < KEY_COUNT; key++)
{
@@ -622,7 +616,6 @@ myScreenGetClientFromWindow (ScreenInfo *screen_info, Window w, unsigned short m
guint i;
g_return_val_if_fail (w != None, NULL);
- TRACE ("entering myScreenGetClientFromWindow");
TRACE ("looking for (0x%lx)", w);
for (c = screen_info->clients, i = 0; i < screen_info->client_count; c = c->next, i++)
@@ -647,7 +640,6 @@ myScreenComputeSize (ScreenInfo *screen_info)
g_return_val_if_fail (screen_info != NULL, FALSE);
g_return_val_if_fail (GDK_IS_SCREEN (screen_info->gscr), FALSE);
- TRACE ("entering myScreenComputeSize");
width = 0;
height = 0;
@@ -687,7 +679,7 @@ myScreenComputeSize (ScreenInfo *screen_info)
changed = ((screen_info->width != width) | (screen_info->height != height));
screen_info->width = width;
screen_info->height = height;
- TRACE ("myScreenComputeSize(): width=%i, height=%i", width, height);
+ TRACE ("width=%i, height=%i", width, height);
return changed;
}
@@ -697,7 +689,6 @@ myScreenGetNumMonitors (ScreenInfo *screen_info)
{
g_return_val_if_fail (screen_info != NULL, 0);
g_return_val_if_fail (screen_info->monitors_index != NULL, 0);
- TRACE ("entering myScreenGetNMonitors");
return (screen_info->monitors_index->len);
}
@@ -707,7 +698,6 @@ myScreenGetMonitorIndex (ScreenInfo *screen_info, gint idx)
{
g_return_val_if_fail (screen_info != NULL, 0);
g_return_val_if_fail (screen_info->monitors_index != NULL, 0);
- TRACE ("entering myScreenGetMonitorIndex");
return (g_array_index (screen_info->monitors_index, gint, idx));
}
@@ -720,7 +710,6 @@ myScreenRebuildMonitorIndex (ScreenInfo *screen_info)
gboolean cloned;
g_return_val_if_fail (screen_info != NULL, FALSE);
- TRACE ("entering myScreenRebuildMonitorIndex");
previous_num_monitors = screen_info->num_monitors;
screen_info->num_monitors = 0;
@@ -755,8 +744,8 @@ myScreenRebuildMonitorIndex (ScreenInfo *screen_info)
}
}
- TRACE ("Physical monitor reported.: %i", num_monitors);
- TRACE ("Logical views found.......: %i", screen_info->num_monitors);
+ TRACE ("physical monitor reported.: %i", num_monitors);
+ TRACE ("logical views found.......: %i", screen_info->num_monitors);
return (screen_info->num_monitors != previous_num_monitors);
}
@@ -765,7 +754,7 @@ void
myScreenInvalidateMonitorCache (ScreenInfo *screen_info)
{
g_return_if_fail (screen_info != NULL);
- TRACE ("entering myScreenInvalidateMonitorCache");
+ TRACE ("entering");
screen_info->cache_monitor.x = -1;
screen_info->cache_monitor.y = -1;
@@ -787,7 +776,7 @@ myScreenFindMonitorAtPoint (ScreenInfo *screen_info, gint x, gint y, GdkRectangl
g_return_if_fail (screen_info != NULL);
g_return_if_fail (rect != NULL);
g_return_if_fail (GDK_IS_SCREEN (screen_info->gscr));
- TRACE ("entering myScreenFindMonitorAtPoint");
+ TRACE ("(%i,%i)", x, y);
/* Cache system */
if ((x >= screen_info->cache_monitor.x) && (x < screen_info->cache_monitor.x + screen_info->cache_monitor.width) &&
@@ -873,7 +862,6 @@ myScreenGetFontDescription (ScreenInfo *screen_info)
GtkWidget *widget;
g_return_val_if_fail (screen_info != NULL, FALSE);
- TRACE ("entering myScreenGetFontDescription");
if (screen_info->font_desc != NULL)
{
@@ -893,7 +881,6 @@ myScreenUpdateFontHeight (ScreenInfo *screen_info)
GtkWidget *widget;
g_return_val_if_fail (screen_info != NULL, FALSE);
- TRACE ("entering myScreenUpdateFontHeight");
widget = myScreenGetGtkWidget (screen_info);
desc = myScreenGetFontDescription (screen_info);
diff --git a/src/settings.c b/src/settings.c
index ee63cd6..11d9107 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -727,7 +727,7 @@ loadSettings (ScreenInfo *screen_info)
{NULL, NULL, G_TYPE_INVALID, FALSE}
};
- TRACE ("entering loadSettings");
+ TRACE ("entering");
loadRcData (screen_info, rc);
loadXfconfData (screen_info, rc);
@@ -889,7 +889,7 @@ unloadTheme (ScreenInfo *screen_info)
{
int i, j;
- TRACE ("entering unloadTheme");
+ TRACE ("entering");
if (screen_info->font_desc != NULL)
{
@@ -947,7 +947,7 @@ unloadSettings (ScreenInfo *screen_info)
{
g_return_if_fail (screen_info);
- TRACE ("entering unloadSettings");
+ TRACE ("entering");
unloadTheme (screen_info);
unloadKeyBindings (screen_info);
@@ -982,7 +982,7 @@ reloadSettings (DisplayInfo *display_info, int mask)
g_return_val_if_fail (display_info, FALSE);
- TRACE ("entering reloadSettings");
+ TRACE ("entering");
/* Refresh all screens, not just one */
for (screens = display_info->screens; screens; screens = g_slist_next (screens))
@@ -1008,7 +1008,7 @@ initSettings (ScreenInfo *screen_info)
g_return_val_if_fail (screen_info, FALSE);
- TRACE ("entering initSettings");
+ TRACE ("entering");
if (!xfconf_init (NULL))
{
@@ -1408,7 +1408,7 @@ keymap_reload (gpointer data)
ScreenInfo *screen_info = (ScreenInfo *) data;
g_return_val_if_fail (screen_info != NULL, FALSE);
- TRACE ("entering keymap_reload");
+ TRACE ("entering");
/* Recompute modifiers mask in case it changed */
initModifiers (myScreenGetXDisplay (screen_info));
diff --git a/src/stacking.c b/src/stacking.c
index 1d0a59a..2239ac7 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -86,7 +86,7 @@ clientGetLowestTransient (Client * c)
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering clientGetLowestTransient");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
lowest_transient = NULL;
screen_info = c->screen_info;
@@ -111,7 +111,8 @@ clientGetHighestTransientOrModalFor (Client * c)
GList *list;
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering clientGetHighestTransientOrModalFor");
+
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
highest_transient = NULL;
@@ -139,7 +140,8 @@ clientGetTopMostForGroup (Client * c)
GList *list;
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering clientGetTopMostForGroup");
+
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
top_most = NULL;
@@ -166,7 +168,8 @@ clientIsTopMost (Client *c)
Client *c2;
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientIsTopMost");
+
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
@@ -193,7 +196,7 @@ clientGetNextTopMost (ScreenInfo *screen_info, guint layer, Client * exclude)
Client *top, *c;
GList *list;
- TRACE ("entering clientGetNextTopMost");
+ TRACE ("layer %u", layer);
top = NULL;
for (list = screen_info->windows_stack; list; list = g_list_next (list))
@@ -219,7 +222,7 @@ clientGetBottomMost (ScreenInfo *screen_info, guint layer, Client * exclude)
Client *bot, *c;
GList *list;
- TRACE ("entering clientGetBottomMost");
+ TRACE ("layer %u", layer);
bot = NULL;
for (list = screen_info->windows_stack; list; list = g_list_next (list))
@@ -255,7 +258,7 @@ clientAtPosition (ScreenInfo *screen_info, int x, int y, GList * exclude_list)
GList *list;
Client *c, *c2;
- TRACE ("entering clientAtPosition");
+ TRACE ("(%i,%i)", x, y);
c = NULL;
for (list = g_list_last (screen_info->windows_stack); list; list = g_list_previous (list))
@@ -289,7 +292,7 @@ clientRaise (Client * c, Window wsibling)
g_return_if_fail (c != NULL);
- TRACE ("entering clientRaise");
+ TRACE ("client \"%s\" (0x%lx) above (0x%lx)", c->name, c->window, wsibling);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -302,7 +305,6 @@ clientRaise (Client * c, Window wsibling)
TRACE ("client \"%s\" (0x%lx) already raised", c->name, c->window);
return;
}
- TRACE ("raising client \"%s\" (0x%lx) over (0x%lx)", c->name, c->window, wsibling);
/*
* If the raised window is the one that has focus, fine, we can
@@ -448,8 +450,7 @@ clientLower (Client * c, Window wsibling)
g_return_if_fail (c != NULL);
- TRACE ("entering clientLower");
- TRACE ("lowering client \"%s\" (0x%lx) below (0x%lx)", c->name, c->window, wsibling);
+ TRACE ("client \"%s\" (0x%lx) below (0x%lx)", c->name, c->window, wsibling);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -534,8 +535,7 @@ clientAdjustFullscreenLayer (Client *c, gboolean set)
{
g_return_val_if_fail (c, FALSE);
- TRACE ("entering clientAdjustFullscreenLayer");
- TRACE ("%s fullscreen layer for \"%s\" (0x%lx)", set ? "Setting" : "Unsetting", c->name, c->window);
+ TRACE ("%s fullscreen layer for \"%s\" (0x%lx)", set ? "setting" : "unsetting", c->name, c->window);
if (set)
{
@@ -564,7 +564,7 @@ clientAddToList (Client * c)
DisplayInfo *display_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientAddToList");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -585,7 +585,6 @@ clientAddToList (Client * c)
c->prev = c;
}
- TRACE ("adding window \"%s\" (0x%lx) to windows list", c->name, c->window);
screen_info->windows = g_list_append (screen_info->windows, c);
screen_info->windows_stack = g_list_append (screen_info->windows_stack, c);
@@ -601,7 +600,7 @@ clientRemoveFromList (Client * c)
DisplayInfo *display_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientRemoveFromList");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MANAGED);
@@ -625,10 +624,7 @@ clientRemoveFromList (Client * c)
}
}
- TRACE ("removing window \"%s\" (0x%lx) from windows list", c->name, c->window);
screen_info->windows = g_list_remove (screen_info->windows, c);
-
- TRACE ("removing window \"%s\" (0x%lx) from screen_info->windows_stack list", c->name, c->window);
screen_info->windows_stack = g_list_remove (screen_info->windows_stack, c);
clientSetNetClientList (screen_info, display_info->atoms[NET_CLIENT_LIST], screen_info->windows);
@@ -679,13 +675,12 @@ delayed_raise_cb (gpointer data)
{
Client *c;
- TRACE ("entering delayed_raise_cb");
-
clientClearDelayedRaise ();
c = clientGetFocus ();
if (c)
{
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
clientRaise (c, None);
}
return (FALSE);
diff --git a/src/startup_notification.c b/src/startup_notification.c
index b0f56ab..34025c4 100644
--- a/src/startup_notification.c
+++ b/src/startup_notification.c
@@ -235,6 +235,7 @@ sn_client_startup_properties (Client * c)
char *startup_id;
g_return_if_fail (c != NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
startup_id = clientGetStartupId (c);
screen_info = c->screen_info;
@@ -296,7 +297,7 @@ sn_client_startup_properties (Client * c)
/* Set initial time */
timestamp = sn_startup_sequence_get_timestamp (sequence);
- TRACE ("Given startup time: %u", (unsigned int) timestamp);
+ TRACE ("startup time: %u", (unsigned int) timestamp);
if ((c->user_time == (guint32) 0) || TIMESTAMP_IS_BEFORE(c->user_time, timestamp))
{
c->user_time = timestamp;
diff --git a/src/tabwin.c b/src/tabwin.c
index a024bb8..43d7957 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -205,7 +205,7 @@ tabwinSetLabel (TabwinWidget *tabwin_widget, GtkWidget *buttonlabel, gchar *clas
PangoLayout *layout;
g_return_if_fail (tabwin_widget);
- TRACE ("entering tabwinSetLabel");
+ TRACE ("class \"%s\", label \"%s\", workspace %i", class, label, workspace);
message = pretty_string (class);
gtk_label_set_text (GTK_LABEL (buttonlabel), message);
@@ -237,7 +237,6 @@ tabwinSetSelected (TabwinWidget *tabwin_widget, GtkWidget *w, GtkWidget *l)
g_return_if_fail (tabwin_widget);
g_return_if_fail (GTK_IS_WIDGET(w));
- TRACE ("entering tabwinSetSelected");
if (tabwin_widget->selected)
{
@@ -249,6 +248,8 @@ tabwinSetSelected (TabwinWidget *tabwin_widget, GtkWidget *w, GtkWidget *l)
if (c != NULL)
{
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
/* We don't update labels here */
if (c->screen_info->params->cycle_tabwin_mode == OVERFLOW_COLUMN_GRID)
{
@@ -270,7 +271,7 @@ tabwinSelectWidget (Tabwin *tabwin)
Client *c;
g_return_val_if_fail (tabwin != NULL, NULL);
- TRACE ("entering tabwinSelectWidget");
+ TRACE ("entering");
for (tabwin_list = tabwin->tabwin_list; tabwin_list; tabwin_list = g_list_next (tabwin_list))
{
@@ -311,7 +312,7 @@ createWindowIcon (GdkScreen *screen, GdkPixbuf *icon_pixbuf, gint size)
{
GtkIconTheme *icon_theme;
- TRACE ("entering createWindowIcon");
+ TRACE ("entering");
if (icon_pixbuf == NULL)
{
@@ -451,7 +452,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget *tabwin_widget)
gint size_request;
Tabwin *tabwin;
- TRACE ("entering createWindowlist");
+ TRACE ("entering");
g_return_val_if_fail (tabwin_widget != NULL, NULL);
tabwin = tabwin_widget->tabwin;
g_return_val_if_fail (tabwin->client_count > 0, NULL);
@@ -473,7 +474,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget *tabwin_widget)
for (client_list = *tabwin->client_list; client_list; client_list = g_list_next (client_list))
{
c = (Client *) client_list->data;
- TRACE ("createWindowlist: adding %s", c->name);
+ TRACE ("adding \"%s\" (0x%lx)", c->name, c->window);
icon_pixbuf = (GdkPixbuf *) icon_list->data;
icon_list = g_list_next (icon_list);
@@ -564,7 +565,7 @@ tabwinConfigure (TabwinWidget *tabwin_widget, GdkEventConfigure *event)
gint x, y;
g_return_val_if_fail (tabwin_widget != NULL, FALSE);
- TRACE ("entering tabwinConfigure");
+ TRACE ("entering");
if ((tabwin_widget->width == event->width) && (tabwin_widget->height == event->height))
{
@@ -622,7 +623,7 @@ computeTabwinData (ScreenInfo *screen_info, TabwinWidget *tabwin_widget)
gint standard_icon_size;
gboolean preview;
- TRACE ("entering computeTabwinData");
+ TRACE ("entering");
g_return_if_fail (GTK_IS_WIDGET(tabwin_widget));
tabwin = tabwin_widget->tabwin;
g_return_if_fail (tabwin->client_count > 0);
@@ -740,7 +741,7 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo *screen_info, gint monitor_num)
gint border_radius = 0;
GtkBorder border, padding;
- TRACE ("entering tabwinCreateWidget for monitor %i", monitor_num);
+ TRACE ("monitor %i", monitor_num);
tabwin_widget = g_object_new (tabwin_widget_get_type(), "type", GTK_WINDOW_POPUP, NULL);
@@ -877,8 +878,9 @@ tabwinCreate (GList **client_list, GList *selected, gboolean display_workspace)
g_return_val_if_fail (client_list, NULL);
g_return_val_if_fail (*client_list, NULL);
- TRACE ("entering tabwinCreate");
c = (Client *) selected->data;
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
tabwin = g_new0 (Tabwin, 1);
screen_info = c->screen_info;
tabwin->display_workspace = display_workspace;
@@ -905,7 +907,7 @@ Client *
tabwinGetSelected (Tabwin *tabwin)
{
g_return_val_if_fail (tabwin != NULL, NULL);
- TRACE ("entering tabwinGetSelected");
+ TRACE ("entering");
if (tabwin->selected)
{
@@ -924,7 +926,7 @@ tabwinRemoveClient (Tabwin *tabwin, Client *c)
g_return_val_if_fail (tabwin != NULL, NULL);
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering tabwinRemoveClient");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (!*tabwin->client_list)
{
@@ -971,7 +973,7 @@ tabwinSelectHead (Tabwin *tabwin)
TabwinWidget *tabwin_widget;
g_return_val_if_fail (tabwin != NULL, NULL);
- TRACE ("entering tabwinSelectFirst");
+ TRACE ("entering");
head = *tabwin->client_list;
if (!head)
@@ -1011,7 +1013,7 @@ tabwinSelectNext (Tabwin *tabwin)
GList *next;
g_return_val_if_fail (tabwin != NULL, NULL);
- TRACE ("entering tabwinSelectNext");
+ TRACE ("entering");
next = g_list_next (tabwin->selected);
if (!next)
@@ -1028,7 +1030,7 @@ tabwinSelectPrev (Tabwin *tabwin)
GList *prev;
g_return_val_if_fail (tabwin != NULL, NULL);
- TRACE ("entering tabwinSelectPrev");
+ TRACE ("entering");
prev = g_list_previous (tabwin->selected);
if (!prev)
@@ -1047,7 +1049,7 @@ tabwinSelectDelta (Tabwin *tabwin, int row_delta, int col_delta)
Client *c;
ScreenInfo *screen_info;
- TRACE ("entering tabwinSelectDelta");
+ TRACE ("entering");
g_return_val_if_fail (tabwin != NULL, NULL);
pos_current = g_list_position (*tabwin->client_list, tabwin->selected);
@@ -1243,7 +1245,7 @@ tabwinSelectHovered (Tabwin *tabwin)
Client *c;
g_return_val_if_fail (tabwin != NULL, NULL);
- TRACE ("entering tabwinSelectHovered");
+ TRACE ("entering");
for (tabwin_list = tabwin->tabwin_list; tabwin_list; tabwin_list = g_list_next (tabwin_list))
{
@@ -1271,7 +1273,7 @@ tabwinDestroy (Tabwin *tabwin)
TabwinWidget *tabwin_widget;
g_return_if_fail (tabwin != NULL);
- TRACE ("entering tabwinDestroy");
+ TRACE ("entering");
for (tabwin_list = tabwin->tabwin_list; tabwin_list; tabwin_list = g_list_next (tabwin_list))
{
diff --git a/src/transients.c b/src/transients.c
index a337ab0..8eac2f0 100644
--- a/src/transients.c
+++ b/src/transients.c
@@ -37,7 +37,7 @@ clientGetTransient (Client * c)
{
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering clientGetTransient");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if ((c->transient_for) && (c->transient_for != c->screen_info->xroot))
{
@@ -51,7 +51,7 @@ clientIsTransient (Client * c)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientIsTransient");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
return (((c->transient_for != c->screen_info->xroot) && (c->transient_for != None) && (c->transient_for != c->window)) ||
((c->transient_for == c->screen_info->xroot) && (c->group_leader != None) && (c->group_leader != c->window)));
@@ -62,7 +62,7 @@ clientIsModal (Client * c)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientIsModal");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
/*
If the WM_TRANSIENT_FOR hint is set to another toplevel window, the dialog is modal for that window;
if WM_TRANSIENT_FOR is not set or set to the root window the dialog is modal for its window group.
@@ -77,7 +77,7 @@ clientIsTransientOrModal (Client * c)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientIsTransientOrModal");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
return (clientIsTransient(c) || clientIsModal(c));
}
@@ -88,7 +88,8 @@ clientSameGroup (Client * c1, Client * c2)
g_return_val_if_fail (c1 != NULL, FALSE);
g_return_val_if_fail (c2 != NULL, FALSE);
- TRACE ("entering clientSameGroup");
+ TRACE ("client 1 \"%s\" (0x%lx), client 2 \"%s\" (0x%lx)",
+ c1->name, c1->window, c2->name, c2->window);
return ((c1 != c2) &&
(((c1->group_leader != None) &&
@@ -103,7 +104,8 @@ clientSameLeader (Client * c1, Client * c2)
g_return_val_if_fail (c1 != NULL, FALSE);
g_return_val_if_fail (c2 != NULL, FALSE);
- TRACE ("entering clientSameLeader");
+ TRACE ("client 1 \"%s\" (0x%lx), client 2 \"%s\" (0x%lx)",
+ c1->name, c1->window, c2->name, c2->window);
return ((c1 != c2) &&
(((c1->client_leader != None) &&
@@ -118,7 +120,8 @@ clientSameName (Client * c1, Client * c2)
g_return_val_if_fail (c1 != NULL, FALSE);
g_return_val_if_fail (c2 != NULL, FALSE);
- TRACE ("entering clientSameName");
+ TRACE ("client 1 \"%s\" (0x%lx), client 2 \"%s\" (0x%lx)",
+ c1->name, c1->window, c2->name, c2->window);
return ((c1 != c2) &&
(c1->class.res_class != NULL) &&
@@ -132,7 +135,8 @@ clientIsTransientFor (Client * c1, Client * c2)
g_return_val_if_fail (c1 != NULL, FALSE);
g_return_val_if_fail (c2 != NULL, FALSE);
- TRACE ("entering clientIsTransientFor");
+ TRACE ("client 1 \"%s\" (0x%lx), client 2 \"%s\" (0x%lx)",
+ c1->name, c1->window, c2->name, c2->window);
if (c1->transient_for)
{
@@ -159,7 +163,8 @@ clientIsModalFor (Client * c1, Client * c2)
g_return_val_if_fail (c1 != NULL, FALSE);
g_return_val_if_fail (c2 != NULL, FALSE);
- TRACE ("entering clientIsModalFor");
+ TRACE ("client 1 \"%s\" (0x%lx), client 2 \"%s\" (0x%lx)",
+ c1->name, c1->window, c2->name, c2->window);
if (FLAG_TEST (c1->flags, CLIENT_FLAG_STATE_MODAL) && (c1->type & WINDOW_REGULAR_FOCUSABLE) && (c1->serial >= c2->serial))
{
@@ -180,7 +185,8 @@ clientIsTransientOrModalFor (Client * c1, Client * c2)
g_return_val_if_fail (c1 != NULL, FALSE);
g_return_val_if_fail (c2 != NULL, FALSE);
- TRACE ("entering clientIsTransientOrModalFor");
+ TRACE ("client 1 \"%s\" (0x%lx), client 2 \"%s\" (0x%lx)",
+ c1->name, c1->window, c2->name, c2->window);
return (clientIsTransientFor(c1, c2) || clientIsModalFor(c1, c2));
}
@@ -190,7 +196,7 @@ clientIsTransientForGroup (Client * c)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientIsTransientForGroup");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
return ((c->transient_for == c->screen_info->xroot) && (c->group_leader != None));
}
@@ -200,7 +206,7 @@ clientIsModalForGroup (Client * c)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientIsModalForGroup");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
return (FLAG_TEST (c->flags, CLIENT_FLAG_STATE_MODAL) && (c->type & WINDOW_REGULAR_FOCUSABLE) &&
!clientIsTransient(c) && (c->group_leader != None));
@@ -211,7 +217,7 @@ clientIsTransientOrModalForGroup (Client * c)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientIsTransientOrModalForGroup");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
return (clientIsTransientForGroup(c) || clientIsModalForGroup(c));
}
@@ -221,7 +227,7 @@ clientIsValidTransientOrModal (Client * c)
{
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientIsValidTransientOrModal");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (clientIsTransientOrModalForGroup (c))
{
ScreenInfo *screen_info = c->screen_info;
@@ -258,7 +264,7 @@ clientTransientOrModalHasAncestor (Client * c, guint ws)
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientTransientOrModalHasAncestor");
+ TRACE ("client \"%s\" (0x%lx), workspace %u", c->name, c->window, ws);
if (!clientIsTransientOrModal (c))
{
@@ -292,7 +298,7 @@ clientGetModalFor (Client * c)
GList *list;
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering clientGetModalFor");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
for (list = g_list_last(screen_info->windows_stack); list; list = g_list_previous (list))
@@ -318,7 +324,7 @@ clientGetTransientFor (Client * c)
GList *list;
g_return_val_if_fail (c != NULL, NULL);
- TRACE ("entering clientGetTransientFor");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
latest_transient = c;
screen_info = c->screen_info;
@@ -351,6 +357,7 @@ clientListTransient (Client * c)
GList *list1, *list2;
g_return_val_if_fail (c != NULL, NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
transients = NULL;
screen_info = c->screen_info;
@@ -392,6 +399,7 @@ clientListTransientOrModal (Client * c)
GList *list1, *list2;
g_return_val_if_fail (c != NULL, NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
transients = NULL;
@@ -434,6 +442,7 @@ clientCheckTransientWindow (Client *c, Window w)
Client *c2;
g_return_val_if_fail (c != NULL, FALSE);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
transients = clientListTransient (c);
for (list = transients; list; list = g_list_next (list))
@@ -455,6 +464,9 @@ clientSameApplication (Client *c1, Client *c2)
g_return_val_if_fail (c1 != NULL, FALSE);
g_return_val_if_fail (c2 != NULL, FALSE);
+ TRACE ("client 1 \"%s\" (0x%lx), client 2 \"%s\" (0x%lx)",
+ c1->name, c1->window, c2->name, c2->window);
+
return (clientIsTransientOrModalFor (c1, c2) ||
clientIsTransientOrModalFor (c2, c1) ||
clientSameGroup (c1, c2) ||
diff --git a/src/ui_style.c b/src/ui_style.c
index 8b34e43..26790c8 100644
--- a/src/ui_style.c
+++ b/src/ui_style.c
@@ -241,7 +241,7 @@ getUIStyleColor (GtkWidget * win, const gchar * name, const gchar * state, GdkRG
gint gtkstyle;
gchar *property;
- TRACE ("entering getUIStyleColor");
+ TRACE ("name \"%s\", state \"%s\"", name, state);
g_return_val_if_fail (win != NULL, FALSE);
g_return_val_if_fail (GTK_IS_WIDGET (win), FALSE);
@@ -325,7 +325,7 @@ getUIStyleString (GtkWidget * win, const gchar * name, const gchar * state)
gint green;
gint blue;
- TRACE ("entering getUIStyleString");
+ TRACE ("name \"%s\", state \"%s\"", name, state);
if (getUIStyleColor (win, name, state, &color))
{
@@ -351,7 +351,7 @@ getUIPangoFontDesc (GtkWidget * win)
GtkStyleContext *ctx;
PangoFontDescription *font_desc;
- TRACE ("entering getUIPangoFontDesc");
+ TRACE ("entering");
g_return_val_if_fail (win != NULL, NULL);
g_return_val_if_fail (GTK_IS_WIDGET (win), NULL);
@@ -368,7 +368,7 @@ getUIPangoFontDesc (GtkWidget * win)
PangoContext *
getUIPangoContext (GtkWidget * win)
{
- TRACE ("entering getUIPangoContext");
+ TRACE ("entering");
g_return_val_if_fail (win != NULL, NULL);
g_return_val_if_fail (GTK_IS_WIDGET (win), NULL);
diff --git a/src/wireframe.c b/src/wireframe.c
index 3f7338a..561a8f9 100644
--- a/src/wireframe.c
+++ b/src/wireframe.c
@@ -161,7 +161,7 @@ wireframeUpdate (Client *c, WireFrame *wireframe)
g_return_if_fail (c != NULL);
g_return_if_fail (wireframe != NULL);
- TRACE ("entering wireframeUpdate");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
wireframe->x = frameExtentX (c);
wireframe->y = frameExtentY (c);
@@ -203,7 +203,7 @@ wireframeCreate (Client *c)
g_return_val_if_fail (c != NULL, None);
- TRACE ("entering wireframeCreate");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
wireframe = g_new0 (WireFrame, 1);
@@ -268,7 +268,7 @@ wireframeDelete (WireFrame *wireframe)
ScreenInfo *screen_info;
g_return_if_fail (wireframe != None);
- TRACE ("entering wireframeDelete");
+ TRACE ("entering");
screen_info = wireframe->screen_info;
XUnmapWindow (myScreenGetXDisplay (screen_info), wireframe->xwindow);
diff --git a/src/workspaces.c b/src/workspaces.c
index ec85eb2..e4f4f2c 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -188,7 +188,7 @@ workspaceMove (ScreenInfo *screen_info, gint rowmod, gint colmod, Client * c, gu
g_return_val_if_fail (screen_info != NULL, FALSE);
- TRACE ("entering workspaceMove");
+ TRACE ("row %i, mod %i, timestamp %u", rowmod, colmod, timestamp);
workspaceGetPosition (screen_info, screen_info->current_ws, &row, &col);
newrow = modify_with_wrap (row, rowmod, screen_info->desktop_layout.rows, screen_info->params->wrap_layout);
@@ -251,7 +251,7 @@ workspaceSwitch (ScreenInfo *screen_info, gint new_ws, Client * c2, gboolean upd
g_return_if_fail (screen_info != NULL);
- TRACE ("entering workspaceSwitch");
+ TRACE ("workspace %i, timestamp %u", new_ws, timestamp);
display_info = screen_info->display_info;
if ((new_ws == (gint) screen_info->current_ws) && (screen_info->params->toggle_workspaces))
@@ -408,7 +408,7 @@ workspaceSetNames (ScreenInfo * screen_info, gchar **names, int items)
g_return_if_fail (screen_info != NULL);
g_return_if_fail (names != NULL);
- TRACE ("entering workspaceSetNames");
+ TRACE ("entering");
if (screen_info->workspace_names)
{
@@ -428,7 +428,7 @@ workspaceSetCount (ScreenInfo * screen_info, guint count)
g_return_if_fail (screen_info != NULL);
- TRACE ("entering workspaceSetCount");
+ TRACE ("count %u", count);
if (count < 1)
{
@@ -471,7 +471,7 @@ workspaceInsert (ScreenInfo * screen_info, guint position)
g_return_if_fail (screen_info != NULL);
- TRACE ("entering workspaceInsert");
+ TRACE ("position %u", position);
count = screen_info->workspace_count;
workspaceSetCount(screen_info, count + 1);
@@ -499,7 +499,7 @@ workspaceDelete (ScreenInfo * screen_info, guint position)
g_return_if_fail (screen_info != NULL);
- TRACE ("entering workspaceDelete");
+ TRACE ("position %u", position);
count = screen_info->workspace_count;
if ((count < 1) || (position > count))
@@ -535,7 +535,7 @@ workspaceUpdateArea (ScreenInfo *screen_info)
g_return_if_fail (screen_info->margins != NULL);
g_return_if_fail (screen_info->gnome_margins != NULL);
- TRACE ("entering workspaceUpdateArea");
+ TRACE ("entering");
display_info = screen_info->display_info;
prev_top = screen_info->margins[STRUTS_TOP];
@@ -596,7 +596,7 @@ workspaceUpdateArea (ScreenInfo *screen_info)
(prev_right != screen_info->margins[STRUTS_RIGHT]) ||
(prev_bottom != screen_info->margins[STRUTS_BOTTOM]))
{
- TRACE ("Margins have changed, updating net_workarea");
+ TRACE ("margins have changed, updating net_workarea");
setNetWorkarea (display_info, screen_info->xroot, screen_info->workspace_count,
screen_info->logical_width, screen_info->logical_height, screen_info->margins);
/* Also prevent windows from being off screen, just like when screen is resized */
diff --git a/src/xsync.c b/src/xsync.c
index d7ca1ef..920dfdc 100644
--- a/src/xsync.c
+++ b/src/xsync.c
@@ -53,7 +53,7 @@ clientCreateXSyncAlarm (Client *c)
g_return_val_if_fail (c != NULL, FALSE);
g_return_val_if_fail (c->xsync_counter != None, FALSE);
- TRACE ("entering clientCreateXSyncAlarm");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -105,7 +105,7 @@ clientDestroyXSyncAlarm (Client *c)
DisplayInfo *display_info;
g_return_if_fail (c != NULL);
- TRACE ("entering clientDestroyXSyncAlarm");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
clientXSyncClearTimeout (c);
if (c->xsync_alarm != None)
@@ -127,7 +127,7 @@ clientGetXSyncCounter (Client * c)
int nitems;
g_return_val_if_fail (c != NULL, FALSE);
- TRACE ("entering clientGetXSyncCounter");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
screen_info = c->screen_info;
display_info = screen_info->display_info;
@@ -167,7 +167,7 @@ clientXSyncClearTimeout (Client * c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientXSyncClearTimeout");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
FLAG_UNSET (c->flags, CLIENT_FLAG_XSYNC_WAITING);
if (c->xsync_timeout_id)
@@ -182,7 +182,7 @@ clientXSyncTimeout (gpointer data)
{
Client *c;
- TRACE ("entering clientXSyncTimeout");
+ TRACE ("entering");
c = (Client *) data;
if (c)
@@ -201,7 +201,7 @@ clientXSyncResetTimeout (Client * c)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientXSyncResetTimeout");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
clientXSyncClearTimeout (c);
c->xsync_timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT,
@@ -220,7 +220,7 @@ clientXSyncRequest (Client * c)
g_return_if_fail (c != NULL);
g_return_if_fail (c->window != None);
- TRACE ("entering clientXSyncRequest");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
if (FLAG_TEST (c->flags, CLIENT_FLAG_XSYNC_WAITING))
{
@@ -253,7 +253,7 @@ void
clientXSyncUpdateValue (Client *c, XSyncValue value)
{
g_return_if_fail (c != NULL);
- TRACE ("entering clientXSyncUpdateValue");
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
c->xsync_value = value;
if (FLAG_TEST (c->flags, CLIENT_FLAG_XSYNC_EXT_COUNTER))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list