isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-27 15:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make meta_* logging utilities not require line break

Browse Source 
Unlike g_* logging utilities, the meta_* counterparts behave like odd
printf() functions. Lets change that so they fit better into how logging
is done everywhere else.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1466
This commit is contained in:
Jonas Ådahl
2020-10-02 17:47:22 +02:00
parent dbe44f3a83
commit 313e3e771c
50 changed files with 596 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/constraints.c
View File

@ -262,7 +262,7 @@ do_all_constraints (MetaWindow *window,
{
/* Log how the constraint modified the position */
meta_topic (META_DEBUG_GEOMETRY,
"info->current is %d,%d +%d,%d after %s\n",
"info->current is %d,%d +%d,%d after %s",
info->current.x, info->current.y,
info->current.width, info->current.height,
constraint->name);
@ -271,7 +271,7 @@ do_all_constraints (MetaWindow *window,
{
/* Log which constraint was not satisfied */
meta_topic (META_DEBUG_GEOMETRY,
"constraint %s not satisfied.\n",
"constraint %s not satisfied.",
constraint->name);
return FALSE;
}
@ -296,7 +296,7 @@ meta_window_constrain (MetaWindow *window,
gboolean satisfied = FALSE;
meta_topic (META_DEBUG_GEOMETRY,
"Constraining %s in move from %d,%d %dx%d to %d,%d %dx%d\n",
"Constraining %s in move from %d,%d %dx%d to %d,%d %dx%d",
window->desc,
orig->x, orig->y, orig->width, orig->height,
new->x, new->y, new->width, new->height);
@ -448,7 +448,7 @@ setup_constraint_info (ConstraintInfo *info,
" resize_gravity : %s\n"
" fixed_directions: %s\n"
" work_area_monitor: %d,%d +%d,%d\n"
" entire_monitor : %d,%d +%d,%d\n",
" entire_monitor : %d,%d +%d,%d",
info->orig.x, info->orig.y, info->orig.width, info->orig.height,
info->current.x, info->current.y,
info->current.width, info->current.height,
@ -633,7 +633,7 @@ update_onscreen_requirements (MetaWindow *window,
&info->current);
if (old != window->require_fully_onscreen)
meta_topic (META_DEBUG_GEOMETRY,
"require_fully_onscreen for %s toggled to %s\n",
"require_fully_onscreen for %s toggled to %s",
window->desc,
window->require_fully_onscreen ? "TRUE" : "FALSE");
@ -646,7 +646,7 @@ update_onscreen_requirements (MetaWindow *window,
&info->current);
if (old != window->require_on_single_monitor)
meta_topic (META_DEBUG_GEOMETRY,
"require_on_single_monitor for %s toggled to %s\n",
"require_on_single_monitor for %s toggled to %s",
window->desc,
window->require_on_single_monitor ? "TRUE" : "FALSE");
@ -670,7 +670,7 @@ update_onscreen_requirements (MetaWindow *window,
&titlebar_rect);
if (old != window->require_titlebar_visible)
meta_topic (META_DEBUG_GEOMETRY,
"require_titlebar_visible for %s toggled to %s\n",
"require_titlebar_visible for %s toggled to %s",
window->desc,
window->require_titlebar_visible ? "TRUE" : "FALSE");
}
@ -1604,9 +1604,9 @@ do_screen_and_monitor_relative_constraints (
char spanning_region[1 + 28 * g_list_length (region_spanning_rectangles)];
meta_topic (META_DEBUG_GEOMETRY,
"screen/monitor constraint; region_spanning_rectangles: %s\n",
meta_rectangle_region_to_string (region_spanning_rectangles, ", ",
spanning_region));
"screen/monitor constraint; region_spanning_rectangles: %s",
meta_rectangle_region_to_string (region_spanning_rectangles, ", ",
spanning_region));
}
#endif

4
src/core/delete.c
View File

@ -100,14 +100,14 @@ meta_window_kill (MetaWindow *window)
if (pid > 0)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Killing %s with kill()\n",
"Killing %s with kill()",
window->desc);
if (kill (pid, 9) == 0)
return;
meta_topic (META_DEBUG_WINDOW_OPS,
"Failed to signal %s: %s\n",
"Failed to signal %s: %s",
window->desc, strerror (errno));
}

64
src/core/display.c
View File

@ -1146,7 +1146,7 @@ meta_display_for_x_display (Display *xdisplay)
if (the_display->x11_display->xdisplay == xdisplay)
return the_display;
meta_warning ("Could not find display for X display %p, probably going to crash\n",
meta_warning ("Could not find display for X display %p, probably going to crash",
xdisplay);
return NULL;
@ -1330,7 +1330,7 @@ window_raise_with_delay_callback (void *data)
meta_window_raise (window);
else
meta_topic (META_DEBUG_FOCUS,
"Pointer not inside window, not raising %s\n",
"Pointer not inside window, not raising %s",
window->desc);
}
@ -1342,7 +1342,7 @@ meta_display_queue_autoraise_callback (MetaDisplay *display,
MetaWindow *window)
{
meta_topic (META_DEBUG_FOCUS,
"Queuing an autoraise timeout for %s with delay %d\n",
"Queuing an autoraise timeout for %s with delay %d",
window->desc,
meta_prefs_get_auto_raise_delay ());
@ -1399,7 +1399,7 @@ meta_display_update_focus_window (MetaDisplay *display,
MetaWindow *previous;
meta_topic (META_DEBUG_FOCUS,
"%s is now the previous focus window due to being focused out or unmapped\n",
"%s is now the previous focus window due to being focused out or unmapped",
display->focus_window->desc);
/* Make sure that signals handlers invoked by
@ -1416,12 +1416,12 @@ meta_display_update_focus_window (MetaDisplay *display,
if (display->focus_window)
{
meta_topic (META_DEBUG_FOCUS, "* Focus --> %s\n",
meta_topic (META_DEBUG_FOCUS, "* Focus --> %s",
display->focus_window->desc);
meta_window_set_focused_internal (display->focus_window, TRUE);
}
else
meta_topic (META_DEBUG_FOCUS, "* Focus --> NULL\n");
meta_topic (META_DEBUG_FOCUS, "* Focus --> NULL");
if (meta_is_wayland_compositor ())
meta_display_sync_wayland_input_focus (display);
@ -1815,13 +1815,13 @@ meta_display_begin_grab_op (MetaDisplay *display,
g_assert (window != NULL);
meta_topic (META_DEBUG_WINDOW_OPS,
"Doing grab op %u on window %s button %d pointer already grabbed: %d pointer pos %d,%d\n",
"Doing grab op %u on window %s button %d pointer already grabbed: %d pointer pos %d,%d",
op, window->desc, button, pointer_already_grabbed,
root_x, root_y);
if (display->grab_op != META_GRAB_OP_NONE)
{
meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect",
op, window->desc, display->grab_op,
display->grab_window ? display->grab_window->desc : "none");
return FALSE;
@ -1874,7 +1874,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (!display->grab_have_pointer && !meta_grab_op_is_keyboard (op))
{
meta_topic (META_DEBUG_WINDOW_OPS, "XIGrabDevice() failed\n");
meta_topic (META_DEBUG_WINDOW_OPS, "XIGrabDevice() failed");
return FALSE;
}
@ -1885,7 +1885,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
if (!display->grab_have_keyboard)
{
meta_topic (META_DEBUG_WINDOW_OPS, "grabbing all keys failed, ungrabbing pointer\n");
meta_topic (META_DEBUG_WINDOW_OPS, "grabbing all keys failed, ungrabbing pointer");
meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp);
display->grab_have_pointer = FALSE;
return FALSE;
@ -1911,7 +1911,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
g_clear_handle_id (&display->grab_resize_timeout_id, g_source_remove);
meta_topic (META_DEBUG_WINDOW_OPS,
"Grab op %u on window %s successful\n",
"Grab op %u on window %s successful",
display->grab_op, window ? window->desc : "(null)");
meta_window_get_frame_rect (display->grab_window,
@ -1941,7 +1941,7 @@ meta_display_end_grab_op (MetaDisplay *display,
MetaGrabOp grab_op = display->grab_op;
meta_topic (META_DEBUG_WINDOW_OPS,
"Ending grab op %u at time %u\n", grab_op, timestamp);
"Ending grab op %u at time %u", grab_op, timestamp);
if (display->event_route == META_EVENT_ROUTE_NORMAL ||
display->event_route == META_EVENT_ROUTE_COMPOSITOR_GRAB)
@ -1981,7 +1981,7 @@ meta_display_end_grab_op (MetaDisplay *display,
if (display->grab_have_keyboard)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Ungrabbing all keys timestamp %u\n", timestamp);
"Ungrabbing all keys timestamp %u", timestamp);
meta_window_ungrab_all_keys (grab_window, timestamp);
}
@ -2125,7 +2125,7 @@ meta_display_ping_timeout (gpointer data)
ping_data->ping_timeout_id = 0;
meta_topic (META_DEBUG_PING,
"Ping %u on window %s timed out\n",
"Ping %u on window %s timed out",
ping_data->serial, ping_data->window->desc);
display->pending_pings = g_slist_remove (display->pending_pings, ping_data);
@ -2165,7 +2165,7 @@ meta_display_ping_window (MetaWindow *window,
if (serial == 0)
{
meta_warning ("Tried to ping window %s with a bad serial! Not allowed.\n",
meta_warning ("Tried to ping window %s with a bad serial! Not allowed.",
window->desc);
return;
}
@ -2180,7 +2180,7 @@ meta_display_ping_window (MetaWindow *window,
if (window == ping_data->window)
{
meta_topic (META_DEBUG_PING,
"Window %s already is being pinged with serial %u\n",
"Window %s already is being pinged with serial %u",
window->desc, ping_data->serial);
return;
}
@ -2188,7 +2188,7 @@ meta_display_ping_window (MetaWindow *window,
if (serial == ping_data->serial)
{
meta_warning ("Ping serial %u was reused for window %s, "
"previous use was for window %s.\n",
"previous use was for window %s.",
serial, window->desc, ping_data->window->desc);
return;
}
@ -2206,7 +2206,7 @@ meta_display_ping_window (MetaWindow *window,
display->pending_pings = g_slist_prepend (display->pending_pings, ping_data);
meta_topic (META_DEBUG_PING,
"Sending ping with serial %u to window %s\n",
"Sending ping with serial %u to window %s",
serial, window->desc);
META_WINDOW_GET_CLASS (window)->ping (window, serial);
@ -2227,7 +2227,7 @@ meta_display_pong_for_serial (MetaDisplay *display,
{
GSList *tmp;
meta_topic (META_DEBUG_PING, "Received a pong with serial %u\n", serial);
meta_topic (META_DEBUG_PING, "Received a pong with serial %u", serial);
for (tmp = display->pending_pings; tmp; tmp = tmp->next)
{
@ -2236,7 +2236,7 @@ meta_display_pong_for_serial (MetaDisplay *display,
if (serial == ping_data->serial)
{
meta_topic (META_DEBUG_PING,
"Matching ping found for pong %u\n",
"Matching ping found for pong %u",
ping_data->serial);
/* Remove the ping data from the list */
@ -2686,7 +2686,7 @@ meta_display_sanity_check_timestamps (MetaDisplay *display,
meta_warning ("last_focus_time (%u) is greater than comparison "
"timestamp (%u). This most likely represents a buggy "
"client sending inaccurate timestamps in messages such as "
"_NET_ACTIVE_WINDOW. Trying to work around...\n",
"_NET_ACTIVE_WINDOW. Trying to work around...",
display->last_focus_time, timestamp);
display->last_focus_time = timestamp;
}
@ -2698,7 +2698,7 @@ meta_display_sanity_check_timestamps (MetaDisplay *display,
meta_warning ("last_user_time (%u) is greater than comparison "
"timestamp (%u). This most likely represents a buggy "
"client sending inaccurate timestamps in messages such as "
"_NET_ACTIVE_WINDOW. Trying to work around...\n",
"_NET_ACTIVE_WINDOW. Trying to work around...",
display->last_user_time, timestamp);
display->last_user_time = timestamp;
@ -2711,7 +2711,7 @@ meta_display_sanity_check_timestamps (MetaDisplay *display,
if (XSERVER_TIME_IS_BEFORE (timestamp, window->net_wm_user_time))
{
meta_warning ("%s appears to be one of the offending windows "
"with a timestamp of %u. Working around...\n",
"with a timestamp of %u. Working around...",
window->desc, window->net_wm_user_time);
meta_window_set_user_time (window, timestamp);
}
@ -3292,7 +3292,7 @@ meta_display_apply_startup_properties (MetaDisplay *display,
startup_id = meta_window_get_startup_id (window);
meta_topic (META_DEBUG_STARTUP,
"Applying startup props to %s id \"%s\"\n",
"Applying startup props to %s id \"%s\"",
window->desc,
startup_id ? startup_id : "(none)");
@ -3311,7 +3311,7 @@ meta_display_apply_startup_properties (MetaDisplay *display,
startup_id = window->startup_id;
meta_topic (META_DEBUG_STARTUP,
"Ending legacy sequence %s due to window %s\n",
"Ending legacy sequence %s due to window %s",
meta_startup_sequence_get_id (sequence),
window->desc);
@ -3339,7 +3339,7 @@ meta_display_apply_startup_properties (MetaDisplay *display,
gboolean changed_something = FALSE;
meta_topic (META_DEBUG_STARTUP,
"Found startup sequence for window %s ID \"%s\"\n",
"Found startup sequence for window %s ID \"%s\"",
window->desc, startup_id);
if (!window->initial_workspace_set)
@ -3348,7 +3348,7 @@ meta_display_apply_startup_properties (MetaDisplay *display,
if (space >= 0)
{
meta_topic (META_DEBUG_STARTUP,
"Setting initial window workspace to %d based on startup info\n",
"Setting initial window workspace to %d based on startup info",
space);
window->initial_workspace_set = TRUE;
@ -3361,7 +3361,7 @@ meta_display_apply_startup_properties (MetaDisplay *display,
{
guint32 timestamp = meta_startup_sequence_get_timestamp (sequence);
meta_topic (META_DEBUG_STARTUP,
"Setting initial window timestamp to %u based on startup info\n",
"Setting initial window timestamp to %u based on startup info",
timestamp);
window->initial_timestamp_set = TRUE;
@ -3374,7 +3374,7 @@ meta_display_apply_startup_properties (MetaDisplay *display,
else
{
meta_topic (META_DEBUG_STARTUP,
"Did not find startup sequence for window %s ID \"%s\"\n",
"Did not find startup sequence for window %s ID \"%s\"",
window->desc, startup_id);
}
@ -3385,7 +3385,7 @@ static gboolean
set_work_area_later_func (MetaDisplay *display)
{
meta_topic (META_DEBUG_WORKAREA,
"Running work area hint computation function\n");
"Running work area hint computation function");
display->work_area_later = 0;
@ -3401,7 +3401,7 @@ meta_display_queue_workarea_recalc (MetaDisplay *display)
if (display->work_area_later == 0)
{
meta_topic (META_DEBUG_WORKAREA,
"Adding work area hint computation function\n");
"Adding work area hint computation function");
display->work_area_later =
meta_later_add (META_LATER_BEFORE_REDRAW,
(GSourceFunc) set_work_area_later_func,
@ -3747,7 +3747,7 @@ meta_display_get_pointer_window (MetaDisplay *display,
if (not_this_one)
meta_topic (META_DEBUG_FOCUS,
"Focusing mouse window excluding %s\n", not_this_one->desc);
"Focusing mouse window excluding %s", not_this_one->desc);
meta_cursor_tracker_get_pointer (cursor_tracker, &point, NULL);

12
src/core/edge-resistance.c
View File

@ -826,15 +826,15 @@ cache_edges (MetaDisplay *display,
meta_rectangle_edge_list_to_string (window_edges, ", ", big_buffer);
meta_topic (META_DEBUG_EDGE_RESISTANCE,
"Window edges for resistance : %s\n", big_buffer);
"Window edges for resistance : %s", big_buffer);
meta_rectangle_edge_list_to_string (monitor_edges, ", ", big_buffer);
meta_topic (META_DEBUG_EDGE_RESISTANCE,
"Monitor edges for resistance: %s\n", big_buffer);
"Monitor edges for resistance: %s", big_buffer);
meta_rectangle_edge_list_to_string (screen_edges, ", ", big_buffer);
meta_topic (META_DEBUG_EDGE_RESISTANCE,
"Screen edges for resistance : %s\n", big_buffer);
"Screen edges for resistance : %s", big_buffer);
}
#endif
@ -999,7 +999,7 @@ compute_resistance_and_snapping_edges (MetaDisplay *display)
g_assert (display->grab_window != NULL);
meta_topic (META_DEBUG_WINDOW_OPS,
"Computing edges to resist-movement or snap-to for %s.\n",
"Computing edges to resist-movement or snap-to for %s.",
display->grab_window->desc);
/*
@ -1245,7 +1245,7 @@ meta_window_edge_resistance_for_move (MetaWindow *window,
(BOX_TOP (*reference) - BOX_TOP (old_outer));
meta_topic (META_DEBUG_EDGE_RESISTANCE,
"outer x & y move-to coordinate changed from %d,%d to %d,%d\n",
"outer x & y move-to coordinate changed from %d,%d to %d,%d",
proposed_outer.x, proposed_outer.y,
*new_x, *new_y);
}
@ -1286,7 +1286,7 @@ meta_window_edge_resistance_for_resize (MetaWindow *window,
*new_height = new_outer.height;
meta_topic (META_DEBUG_EDGE_RESISTANCE,
"outer width & height got changed from %d,%d to %d,%d\n",
"outer width & height got changed from %d,%d to %d,%d",
proposed_outer_width, proposed_outer_height,
new_outer.width, new_outer.height);
}

6
src/core/events.c
View File

@ -178,12 +178,12 @@ maybe_unfreeze_pointer_events (MetaBackend *backend,
{
case EVENTS_UNFREEZE_SYNC:
event_mode = XISyncDevice;
meta_verbose ("Syncing events time %u device %i\n",
meta_verbose ("Syncing events time %u device %i",
(unsigned int) event->button.time, device_id);
break;
case EVENTS_UNFREEZE_REPLAY:
event_mode = XIReplayDevice;
meta_verbose ("Replaying events time %u device %i\n",
meta_verbose ("Replaying events time %u device %i",
(unsigned int) event->button.time, device_id);
break;
default:
@ -322,7 +322,7 @@ meta_display_handle_event (MetaDisplay *display,
*/
meta_warning ("Event has no timestamp! You may be using a broken "
"program such as xse. Please ask the authors of that "
"program to fix it.\n");
"program to fix it.");
}
else
{

12
src/core/frame.c
View File

@ -62,7 +62,7 @@ meta_window_ensure_frame (MetaWindow *window)
frame->borders_cached = FALSE;
meta_verbose ("Frame geometry %d,%d %dx%d\n",
meta_verbose ("Frame geometry %d,%d %dx%d",
frame->rect.x, frame->rect.y,
frame->rect.width, frame->rect.height);
@ -81,7 +81,7 @@ meta_window_ensure_frame (MetaWindow *window)
frame->xwindow,
create_serial);
meta_verbose ("Frame for %s is 0x%lx\n", frame->window->desc, frame->xwindow);
meta_verbose ("Frame for %s is 0x%lx", frame->window->desc, frame->xwindow);
attrs.event_mask = EVENT_MASK;
XChangeWindowAttributes (x11_display->xdisplay,
frame->xwindow, CWEventMask, &attrs);
@ -95,7 +95,7 @@ meta_window_ensure_frame (MetaWindow *window)
* we don't want to take that as a withdraw
*/
meta_topic (META_DEBUG_WINDOW_STATE,
"Incrementing unmaps_pending on %s for reparent\n", window->desc);
"Incrementing unmaps_pending on %s for reparent", window->desc);
window->unmaps_pending += 1;
}
@ -171,7 +171,7 @@ meta_window_destroy_frame (MetaWindow *window)
x11_display = window->display->x11_display;
meta_verbose ("Unframing window %s\n", window->desc);
meta_verbose ("Unframing window %s", window->desc);
frame = window->frame;
@ -188,7 +188,7 @@ meta_window_destroy_frame (MetaWindow *window)
* by the client.
*/
meta_topic (META_DEBUG_WINDOW_STATE,
"Incrementing unmaps_pending on %s for reparent back to root\n", window->desc);
"Incrementing unmaps_pending on %s for reparent back to root", window->desc);
window->unmaps_pending += 1;
}
@ -349,7 +349,7 @@ meta_frame_sync_to_window (MetaFrame *frame,
gboolean need_resize)
{
meta_topic (META_DEBUG_GEOMETRY,
"Syncing frame geometry %d,%d %dx%d (SE: %d,%d)\n",
"Syncing frame geometry %d,%d %dx%d (SE: %d,%d)",
frame->rect.x, frame->rect.y,
frame->rect.width, frame->rect.height,
frame->rect.x + frame->rect.width,

54
src/core/keybindings.c
View File

@ -288,7 +288,7 @@ reload_modmap (MetaKeyBindingManager *keys)
keys->ignored_modifier_mask = (scroll_lock_mask | Mod2Mask | LockMask);
meta_topic (META_DEBUG_KEYBINDINGS,
"Ignoring modmask 0x%x scroll lock 0x%x hyper 0x%x super 0x%x meta 0x%x\n",
"Ignoring modmask 0x%x scroll lock 0x%x hyper 0x%x super 0x%x meta 0x%x",
keys->ignored_modifier_mask,
scroll_lock_mask,
keys->hyper_mask,
@ -590,7 +590,7 @@ index_binding (MetaKeyBindingManager *keys,
continue;
meta_warning ("Overwriting existing binding of keysym %x"
" with keysym %x (keycode %x).\n",
" with keysym %x (keycode %x).",
binding->combo.keysym,
existing->combo.keysym,
binding->resolved_combo.keycodes[i]);
@ -860,7 +860,7 @@ rebuild_binding_table (MetaKeyBindingManager *keys,
}
meta_topic (META_DEBUG_KEYBINDINGS,
" %d bindings in table\n",
" %d bindings in table",
g_hash_table_size (keys->key_bindings));
}
@ -870,7 +870,7 @@ rebuild_key_binding_table (MetaKeyBindingManager *keys)
GList *prefs, *grabs;
meta_topic (META_DEBUG_KEYBINDINGS,
"Rebuilding key binding table from preferences\n");
"Rebuilding key binding table from preferences");
prefs = meta_prefs_get_keybindings ();
grabs = g_hash_table_get_values (external_grabs);
@ -1257,7 +1257,7 @@ meta_display_grab_window_buttons (MetaDisplay *display,
* Grab Alt + button3 for popping up window menu.
* Grab Alt + Shift + button1 for snap-moving window.
*/
meta_verbose ("Grabbing window buttons for 0x%lx\n", xwindow);
meta_verbose ("Grabbing window buttons for 0x%lx", xwindow);
/* FIXME If we ignored errors here instead of spewing, we could
* put one big error trap around the loop and avoid a bunch of
@ -1314,11 +1314,11 @@ meta_display_grab_focus_window_button (MetaDisplay *display,
MetaKeyBindingManager *keys = &display->key_binding_manager;
/* Grab button 1 for activating unfocused windows */
meta_verbose ("Grabbing unfocused window buttons for %s\n", window->desc);
meta_verbose ("Grabbing unfocused window buttons for %s", window->desc);
if (window->have_focus_click_grab)
{
meta_verbose (" (well, not grabbing since we already have the grab)\n");
meta_verbose (" (well, not grabbing since we already have the grab)");
return;
}
@ -1337,7 +1337,7 @@ meta_display_ungrab_focus_window_button (MetaDisplay *display,
{
MetaKeyBindingManager *keys = &display->key_binding_manager;
meta_verbose ("Ungrabbing unfocused window buttons for %s\n", window->desc);
meta_verbose ("Ungrabbing unfocused window buttons for %s", window->desc);
if (!window->have_focus_click_grab)
return;
@ -1440,7 +1440,7 @@ meta_change_keygrab (MetaKeyBindingManager *keys,
xkb_keycode_t keycode = resolved_combo->keycodes[i];
meta_topic (META_DEBUG_KEYBINDINGS,
"%s keybinding keycode %d mask 0x%x on 0x%lx\n",
"%s keybinding keycode %d mask 0x%x on 0x%lx",
grab ? "Grabbing" : "Ungrabbing",
keycode, resolved_combo->mask, xwindow);
@ -1658,8 +1658,8 @@ meta_display_grab_accelerator (MetaDisplay *display,
if (!meta_parse_accelerator (accelerator, &combo))
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Failed to parse accelerator\n");
meta_warning ("\"%s\" is not a valid accelerator\n", accelerator);
"Failed to parse accelerator");
meta_warning ("\"%s\" is not a valid accelerator", accelerator);
return META_KEYBINDING_ACTION_NONE;
}
@ -1819,7 +1819,7 @@ meta_window_grab_all_keys (MetaWindow *window,
* won't do a lot of good.
*/
meta_topic (META_DEBUG_FOCUS,
"Focusing %s because we're grabbing all its keys\n",
"Focusing %s because we're grabbing all its keys",
window->desc);
meta_window_focus (window, timestamp);
@ -1828,7 +1828,7 @@ meta_window_grab_all_keys (MetaWindow *window,
grabwindow = meta_window_x11_get_toplevel_xwindow (window);
meta_topic (META_DEBUG_KEYBINDINGS,
"Grabbing all keys on window %s\n", window->desc);
"Grabbing all keys on window %s", window->desc);
retval = grab_keyboard (grabwindow, timestamp, XIGrabModeAsync);
}
if (retval)
@ -1973,7 +1973,7 @@ process_event (MetaDisplay *display,
goto not_found;
if (binding->handler == NULL)
meta_bug ("Binding %s has no handler\n", binding->name);
meta_bug ("Binding %s has no handler", binding->name);
if (!meta_key_binding_has_handler_func (binding))
goto not_found;
@ -1998,13 +1998,13 @@ process_event (MetaDisplay *display,
binding->flags & META_KEY_BINDING_IGNORE_AUTOREPEAT)
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Ignore autorepeat for handler %s\n",
"Ignore autorepeat for handler %s",
binding->name);
return TRUE;
}
meta_topic (META_DEBUG_KEYBINDINGS,
"Running handler for %s\n",
"Running handler for %s",
binding->name);
/* Global keybindings count as a let-the-terminal-lose-focus
@ -2019,7 +2019,7 @@ process_event (MetaDisplay *display,
not_found:
meta_topic (META_DEBUG_KEYBINDINGS,
"No handler found for this event in this binding table\n");
"No handler found for this event in this binding table");
return FALSE;
}
@ -2280,20 +2280,20 @@ process_key_event (MetaDisplay *display,
if (display->grab_op == META_GRAB_OP_KEYBOARD_MOVING)
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Processing event for keyboard move\n");
"Processing event for keyboard move");
keep_grab = process_keyboard_move_grab (display, window, event);
}
else
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Processing event for keyboard resize\n");
"Processing event for keyboard resize");
keep_grab = process_keyboard_resize_grab (display, window, event);
}
}
else
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Processing event for mouse-only move/resize\n");
"Processing event for mouse-only move/resize");
keep_grab = process_mouse_move_resize_grab (display, window, event);
}
}
@ -2494,7 +2494,7 @@ process_keyboard_move_grab (MetaDisplay *display,
if (handled)
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Computed new window location %d,%d due to keypress\n",
"Computed new window location %d,%d due to keypress",
x, y);
meta_window_edge_resistance_for_move (window,
@ -2844,7 +2844,7 @@ process_keyboard_resize_grab (MetaDisplay *display,
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Computed new window size due to keypress: "
"%dx%d, gravity %s\n",
"%dx%d, gravity %s",
width, height, meta_gravity_to_string (gravity));
/* Do any edge resistance/snapping */
@ -3177,7 +3177,7 @@ handle_panel (MetaDisplay *display,
meta_topic (META_DEBUG_KEYBINDINGS,
"Sending panel message with timestamp %u, and turning mouse_mode "
"off due to keybinding press\n", event->time);
"off due to keybinding press", event->time);
display->mouse_mode = FALSE;
meta_x11_error_trap_push (x11_display);
@ -3231,7 +3231,7 @@ do_choose_window (MetaDisplay *display,
MetaWindow *window;
meta_topic (META_DEBUG_KEYBINDINGS,
"Tab list = %u\n", type);
"Tab list = %u", type);
window = meta_display_get_tab_next (display,
type,
@ -3496,7 +3496,7 @@ handle_move_to_workspace (MetaDisplay *display,
{
meta_topic (META_DEBUG_FOCUS,
"Resetting mouse_mode to FALSE due to "
"handle_move_to_workspace() call with flip set.\n");
"handle_move_to_workspace() call with flip set.");
meta_display_clear_mouse_mode (workspace->display);
meta_workspace_activate_with_focus (workspace,
window,
@ -3605,7 +3605,7 @@ handle_set_spew_mark (MetaDisplay *display,
MetaKeyBinding *binding,
gpointer dummy)
{
meta_verbose ("-- MARK MARK MARK MARK --\n");
meta_verbose ("-- MARK MARK MARK MARK --");
}
#ifdef HAVE_NATIVE_BACKEND
@ -3675,7 +3675,7 @@ handle_restore_shortcuts (MetaDisplay *display,
source = clutter_event_get_source_device ((ClutterEvent *) event);
meta_topic (META_DEBUG_KEYBINDINGS, "Restoring normal keyboard shortcuts\n");
meta_topic (META_DEBUG_KEYBINDINGS, "Restoring normal keyboard shortcuts");
meta_window_force_restore_shortcuts (display->focus_window, source);
}

22
src/core/main.c
View File

@ -147,9 +147,9 @@ static void
meta_print_compilation_info (void)
{
#ifdef HAVE_STARTUP_NOTIFICATION
meta_verbose ("Compiled with startup notification\n");
meta_verbose ("Compiled with startup notification");
#else
meta_verbose ("Compiled without startup notification\n");
meta_verbose ("Compiled without startup notification");
#endif
}
@ -174,12 +174,12 @@ meta_print_self_identity (void)
g_date_clear (&d, 1);
g_date_set_time_t (&d, time (NULL));
g_date_strftime (buf, sizeof (buf), "%x", &d);
meta_verbose ("Mutter version %s running on %s\n",
meta_verbose ("Mutter version %s running on %s",
VERSION, buf);
/* Locale and encoding. */
g_get_charset (&charset);
meta_verbose ("Running in locale \"%s\" with encoding \"%s\"\n",
meta_verbose ("Running in locale \"%s\" with encoding \"%s\"",
setlocale (LC_ALL, NULL), charset);
/* Compilation settings. */
@ -291,7 +291,7 @@ meta_get_option_context (void)
GOptionContext *ctx;
if (setlocale (LC_ALL, "") == NULL)
meta_warning ("Locale not understood by C library, internationalization will not work\n");
meta_warning ("Locale not understood by C library, internationalization will not work");
bindtextdomain (GETTEXT_PACKAGE, MUTTER_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@ -415,7 +415,7 @@ find_session_type (void)
goto out;
}
meta_warning ("Unsupported session type\n");
meta_warning ("Unsupported session type");
meta_exit (META_EXIT_ERROR);
out:
@ -469,14 +469,14 @@ calculate_compositor_configuration (MetaCompositorType *compositor_type,
if ((opt_wayland || opt_nested) && opt_x11)
#endif
{
meta_warning ("Can't run both as Wayland compositor and X11 compositing manager\n");
meta_warning ("Can't run both as Wayland compositor and X11 compositing manager");
meta_exit (META_EXIT_ERROR);
}
#ifdef HAVE_NATIVE_BACKEND
if (opt_nested && opt_display_server)
{
meta_warning ("Can't run both as nested and as a display server\n");
meta_warning ("Can't run both as nested and as a display server");
meta_exit (META_EXIT_ERROR);
}
@ -486,7 +486,7 @@ calculate_compositor_configuration (MetaCompositorType *compositor_type,
if (!run_as_wayland_compositor && opt_no_x11)
{
meta_warning ("Can't disable X11 support on X11 compositor\n");
meta_warning ("Can't disable X11 support on X11 compositor");
meta_exit (META_EXIT_ERROR);
}
@ -612,7 +612,7 @@ meta_init (void)
if (g_get_home_dir ())
if (chdir (g_get_home_dir ()) < 0)
meta_warning ("Could not change to home directory %s.\n",
meta_warning ("Could not change to home directory %s.",
g_get_home_dir ());
meta_print_self_identity ();
@ -634,7 +634,7 @@ meta_init (void)
meta_set_replace_current_wm (TRUE);
if (opt_save_file && opt_client_id)
meta_fatal ("Can't specify both SM save file and SM client id\n");
meta_fatal ("Can't specify both SM save file and SM client id");
meta_main_loop = g_main_loop_new (NULL, FALSE);
}

2
src/core/meta-close-dialog-default.c
View File

@ -89,7 +89,7 @@ present_existing_delete_dialog (MetaCloseDialogDefault *dialog)
return;
meta_topic (META_DEBUG_PING,
"Presenting existing ping dialog for %s\n",
"Presenting existing ping dialog for %s",
window->desc);
/* Activate transient for window that belongs to

7
src/core/meta-workspace-manager.c
View File

@ -577,7 +577,7 @@ meta_workspace_manager_update_workspace_layout (MetaWorkspaceManager *workspace_
workspace_manager->rows_of_workspaces = n_rows;
workspace_manager->columns_of_workspaces = n_columns;
meta_verbose ("Workspace layout rows = %d cols = %d orientation = %d starting corner = %u\n",
meta_verbose ("Workspace layout rows = %d cols = %d orientation = %d starting corner = %u",
workspace_manager->rows_of_workspaces,
workspace_manager->columns_of_workspaces,
workspace_manager->vertical_workspaces,
@ -670,7 +670,7 @@ meta_workspace_manager_calc_workspace_layout (MetaWorkspaceManager *workspace_ma
grid_area = rows * cols;
meta_verbose ("Getting layout rows = %d cols = %d current = %d "
"num_spaces = %d vertical = %s corner = %s\n",
"num_spaces = %d vertical = %s corner = %s",
rows, cols, current_space, num_workspaces,
workspace_manager->vertical_workspaces ? "(true)" : "(false)",
meta_workspace_manager_corner_to_string (workspace_manager->starting_corner));
@ -845,7 +845,7 @@ meta_workspace_manager_calc_workspace_layout (MetaWorkspaceManager *workspace_ma
}
if (i != grid_area)
meta_bug ("did not fill in the whole workspace grid in %s (%d filled)\n",
meta_bug ("did not fill in the whole workspace grid in %s (%d filled)",
G_STRFUNC, i);
current_row = 0;
@ -896,7 +896,6 @@ meta_workspace_manager_calc_workspace_layout (MetaWorkspaceManager *workspace_ma
meta_verbose ("%3d ", layout->grid[r*layout->cols+c]);
++c;
}
meta_verbose ("\n");
meta_pop_no_msg_prefix ();
++r;
}

18
src/core/place.c
View File

@ -360,7 +360,7 @@ avoid_being_obscured_as_second_modal_dialog (MetaWindow *window,
meta_topic (META_DEBUG_PLACEMENT,
"Dialog window %s was denied focus but may be modal "
"to the focus window; had to move it to avoid the "
"focus window\n",
"focus window",
window->desc);
}
}
@ -527,7 +527,7 @@ find_first_fit (MetaWindow *window,
meta_rectangle_to_string (&logical_monitor->rect,
monitor_location_string);
meta_topic (META_DEBUG_PLACEMENT,
"Natural monitor is %s\n",
"Natural monitor is %s",
monitor_location_string);
}
#endif
@ -669,7 +669,7 @@ meta_window_place (MetaWindow *window,
GList *windows = NULL;
MetaLogicalMonitor *logical_monitor;
meta_topic (META_DEBUG_PLACEMENT, "Placing window %s\n", window->desc);
meta_topic (META_DEBUG_PLACEMENT, "Placing window %s", window->desc);
g_return_if_fail (!window->placement.rule);
@ -713,7 +713,8 @@ meta_window_place (MetaWindow *window,
{
/* don't constrain with placement algorithm */
meta_topic (META_DEBUG_PLACEMENT,
"Honoring USPosition for %s instead of using placement algorithm\n", window->desc);
"Honoring USPosition for %s instead of using placement algorithm",
window->desc);
goto done;
}
@ -742,7 +743,7 @@ meta_window_place (MetaWindow *window,
if (window->size_hints.flags & PPosition)
{
meta_topic (META_DEBUG_PLACEMENT,
"Not placing non-normal non-dialog window with PPosition set\n");
"Not placing non-normal non-dialog window with PPosition set");
goto done;
}
break;
@ -756,7 +757,7 @@ meta_window_place (MetaWindow *window,
(window->size_hints.flags & USPosition))
{
meta_topic (META_DEBUG_PLACEMENT,
"Not placing window with PPosition or USPosition set\n");
"Not placing window with PPosition or USPosition set");
avoid_being_obscured_as_second_modal_dialog (window, &x, &y);
goto done;
}
@ -786,7 +787,8 @@ meta_window_place (MetaWindow *window,
*/
y += (parent_frame_rect.height - frame_rect.height)/3;
meta_topic (META_DEBUG_PLACEMENT, "Centered window %s over transient parent\n",
meta_topic (META_DEBUG_PLACEMENT,
"Centered window %s over transient parent",
window->desc);
avoid_being_obscured_as_second_modal_dialog (window, &x, &y);
@ -816,7 +818,7 @@ meta_window_place (MetaWindow *window,
x = work_area.x + (work_area.width - frame_rect.width) / 2;
y = work_area.y + (work_area.height - frame_rect.height) / 2;
meta_topic (META_DEBUG_PLACEMENT, "Centered window %s on monitor %d\n",
meta_topic (META_DEBUG_PLACEMENT, "Centered window %s on monitor %d",
window->desc, logical_monitor->number);
goto done_check_denied_focus;

62
src/core/prefs.c
View File

@ -578,7 +578,7 @@ handle_preference_init_string (void)
if (cursor->handler)
{
if (cursor->target)
meta_bug ("%s has both a target and a handler\n", cursor->base.key);
meta_bug ("%s has both a target and a handler", cursor->base.key);
g_settings_get_mapped (SETTINGS (cursor->base.schema),
cursor->base.key, cursor->handler, NULL);
@ -586,7 +586,7 @@ handle_preference_init_string (void)
else
{
if (!cursor->target)
meta_bug ("%s must have handler or target\n", cursor->base.key);
meta_bug ("%s must have handler or target", cursor->base.key);
g_free (*(cursor->target));
@ -613,7 +613,7 @@ handle_preference_init_string_array (void)
if (cursor->handler)
{
if (cursor->target)
meta_bug ("%s has both a target and a handler\n", cursor->base.key);
meta_bug ("%s has both a target and a handler", cursor->base.key);
g_settings_get_mapped (SETTINGS (cursor->base.schema),
cursor->base.key, cursor->handler, NULL);
@ -621,7 +621,7 @@ handle_preference_init_string_array (void)
else
{
if (!cursor->target)
meta_bug ("%s must have handler or target\n", cursor->base.key);
meta_bug ("%s must have handler or target", cursor->base.key);
if (*(cursor->target))
g_strfreev (*(cursor->target));
@ -744,7 +744,7 @@ handle_preference_update_string (GSettings *settings,
if (cursor->handler)
{
if (cursor->target)
meta_bug ("%s has both a target and a handler\n", cursor->base.key);
meta_bug ("%s has both a target and a handler", cursor->base.key);
g_settings_get_mapped (SETTINGS (cursor->base.schema),
cursor->base.key, cursor->handler, NULL);
@ -752,7 +752,7 @@ handle_preference_update_string (GSettings *settings,
else
{
if (!cursor->target)
meta_bug ("%s must have handler or target\n", cursor->base.key);
meta_bug ("%s must have handler or target", cursor->base.key);
value = g_settings_get_string (SETTINGS (cursor->base.schema),
cursor->base.key);
@ -786,7 +786,7 @@ handle_preference_update_string_array (GSettings *settings,
if (cursor->handler)
{
if (cursor->target)
meta_bug ("%s has both a target and a handler\n", cursor->base.key);
meta_bug ("%s has both a target and a handler", cursor->base.key);
g_settings_get_mapped (SETTINGS (cursor->base.schema),
cursor->base.key, cursor->handler, NULL);
@ -797,7 +797,7 @@ handle_preference_update_string_array (GSettings *settings,
int n_values, n_previous, i;
if (!cursor->target)
meta_bug ("%s must have handler or target\n", cursor->base.key);
meta_bug ("%s must have handler or target", cursor->base.key);
values = g_settings_get_strv (SETTINGS (cursor->base.schema),
cursor->base.key);
@ -924,7 +924,7 @@ emit_changed (MetaPreference pref)
GList *tmp;
GList *copy;
meta_topic (META_DEBUG_PREFS, "Notifying listeners that pref %s changed\n",
meta_topic (META_DEBUG_PREFS, "Notifying listeners that pref %s changed",
meta_preference_to_string (pref));
copy = g_list_copy (listeners);
@ -974,13 +974,13 @@ changed_idle_handler (gpointer data)
static void
queue_changed (MetaPreference pref)
{
meta_topic (META_DEBUG_PREFS, "Queueing change of pref %s\n",
meta_topic (META_DEBUG_PREFS, "Queueing change of pref %s",
meta_preference_to_string (pref));
if (g_list_find (changes, GINT_TO_POINTER (pref)) == NULL)
changes = g_list_prepend (changes, GINT_TO_POINTER (pref));
else
meta_topic (META_DEBUG_PREFS, "Change of pref %s was already pending\n",
meta_topic (META_DEBUG_PREFS, "Change of pref %s was already pending",
meta_preference_to_string (pref));
if (changed_idle == 0)
@ -1158,7 +1158,7 @@ maybe_give_disable_workarounds_warning (void)
first_disable = FALSE;
meta_warning ("Workarounds for broken applications disabled. "
"Some applications may not behave properly.\n");
"Some applications may not behave properly.");
}
}
@ -1249,7 +1249,7 @@ titlebar_handler (GVariant *value,
if (desc == NULL)
{
meta_warning ("Could not parse font description "
"\"%s\" from GSettings key %s\n",
"\"%s\" from GSettings key %s",
string_value ? string_value : "(null)",
KEY_TITLEBAR_FONT);
return FALSE;
@ -1287,17 +1287,17 @@ mouse_button_mods_handler (GVariant *value,
if (!string_value || !meta_parse_modifier (string_value, &mods))
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Failed to parse new GSettings value\n");
"Failed to parse new GSettings value");
meta_warning ("\"%s\" found in configuration database is "
"not a valid value for mouse button modifier\n",
"not a valid value for mouse button modifier",
string_value);
return FALSE;
}
meta_topic (META_DEBUG_KEYBINDINGS,
"Mouse button modifier has new GSettings value \"%s\"\n",
"Mouse button modifier has new GSettings value \"%s\"",
string_value);
if (mods != mouse_button_mods)
@ -1406,7 +1406,8 @@ button_layout_handler (GVariant *value,
}
else
{
meta_topic (META_DEBUG_PREFS, "Ignoring unknown or already-used button name \"%s\"\n",
meta_topic (META_DEBUG_PREFS,
"Ignoring unknown or already-used button name \"%s\"",
buttons[b]);
}
}
@ -1457,7 +1458,8 @@ button_layout_handler (GVariant *value,
}
else
{
meta_topic (META_DEBUG_PREFS, "Ignoring unknown or already-used button name \"%s\"\n",
meta_topic (META_DEBUG_PREFS,
"Ignoring unknown or already-used button name \"%s\"",
buttons[b]);
}
}
@ -1540,7 +1542,7 @@ overlay_key_handler (GVariant *value,
else
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Failed to parse value for overlay-key\n");
"Failed to parse value for overlay-key");
return FALSE;
}
@ -1570,7 +1572,7 @@ locate_pointer_key_handler (GVariant *value,
if (!string_value || !meta_parse_accelerator (string_value, &combo))
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Failed to parse value for locate-pointer-key\n");
"Failed to parse value for locate-pointer-key");
return FALSE;
}
@ -1825,7 +1827,7 @@ update_binding (MetaKeyPref *binding,
int i;
meta_topic (META_DEBUG_KEYBINDINGS,
"Binding \"%s\" has new GSettings value\n",
"Binding \"%s\" has new GSettings value",
binding->name);
old_combos = binding->combos;
@ -1840,8 +1842,8 @@ update_binding (MetaKeyPref *binding,
if (!meta_parse_accelerator (strokes[i], combo))
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Failed to parse new GSettings value\n");
meta_warning ("\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n",
"Failed to parse new GSettings value");
meta_warning ("\"%s\" found in configuration database is not a valid value for keybinding \"%s\"",
strokes[i], binding->name);
g_free (combo);
@ -1916,7 +1918,7 @@ meta_prefs_get_workspace_name (int i)
name = workspace_names[i];
meta_topic (META_DEBUG_PREFS,
"Getting name of workspace %d: \"%s\"\n", i, name);
"Getting name of workspace %d: \"%s\"", i, name);
return name;
}
@ -1931,7 +1933,7 @@ meta_prefs_change_workspace_name (int num,
g_return_if_fail (num >= 0);
meta_topic (META_DEBUG_PREFS,
"Changing name of workspace %d to %s\n",
"Changing name of workspace %d to %s",
num, name ? name : "none");
/* NULL and empty string both mean "default" here,
@ -1941,10 +1943,10 @@ meta_prefs_change_workspace_name (int num,
{
if (!name || !*name)
meta_topic (META_DEBUG_PREFS,
"Workspace %d already uses default name\n", num);
"Workspace %d already uses default name", num);
else
meta_topic (META_DEBUG_PREFS,
"Workspace %d already has name %s\n", num, name);
"Workspace %d already has name %s", num, name);
return;
}
@ -2009,7 +2011,7 @@ meta_prefs_add_keybinding (const char *name,
if (g_hash_table_lookup (key_bindings, name))
{
meta_warning ("Trying to re-add keybinding \"%s\".\n", name);
meta_warning ("Trying to re-add keybinding \"%s\".", name);
return FALSE;
}
@ -2059,13 +2061,13 @@ meta_prefs_remove_keybinding (const char *name)
pref = g_hash_table_lookup (key_bindings, name);
if (!pref)
{
meta_warning ("Trying to remove non-existent keybinding \"%s\".\n", name);
meta_warning ("Trying to remove non-existent keybinding \"%s\".", name);
return FALSE;
}
if (pref->builtin)
{
meta_warning ("Trying to remove builtin keybinding \"%s\".\n", name);
meta_warning ("Trying to remove builtin keybinding \"%s\".", name);
return FALSE;
}

6
src/core/restart.c
View File

@ -74,7 +74,7 @@ restart_helper_read_line_callback (GObject *source_object,
&length, &error);
if (line == NULL)
{
meta_warning ("Failed to read output from restart helper%s%s\n",
meta_warning ("Failed to read output from restart helper%s%s",
error ? ": " : NULL,
error ? error->message : NULL);
}
@ -150,7 +150,7 @@ meta_restart (const char *message)
NULL, /* standard_error */
&error))
{
meta_warning ("Failed to start restart helper: %s\n", error->message);
meta_warning ("Failed to start restart helper: %s", error->message);
goto error;
}
@ -163,7 +163,7 @@ meta_restart (const char *message)
&error);
if (error != NULL)
{
meta_warning ("Failed to read from restart helper: %s\n", error->message);
meta_warning ("Failed to read from restart helper: %s", error->message);
g_object_unref (data_stream);
goto error;
}

15
src/core/stack-tracker.c
View File

@ -235,9 +235,8 @@ stack_dump (MetaStackTracker *tracker,
for (i = 0; i < stack->len; i++)
{
guint64 window = g_array_index (stack, guint64, i);
meta_topic (META_DEBUG_STACK, " %s", get_window_desc (tracker, window));
meta_topic (META_DEBUG_STACK, " %s", get_window_desc (tracker, window));
}
meta_topic (META_DEBUG_STACK, "\n");
meta_pop_no_msg_prefix ();
}
#endif /* WITH_VERBOSE_MODE */
@ -248,9 +247,9 @@ meta_stack_tracker_dump (MetaStackTracker *tracker)
#ifdef WITH_VERBOSE_MODE
GList *l;
meta_topic (META_DEBUG_STACK, "MetaStackTracker state\n");
meta_topic (META_DEBUG_STACK, "MetaStackTracker state");
meta_push_no_msg_prefix ();
meta_topic (META_DEBUG_STACK, " xserver_serial: %ld\n", tracker->xserver_serial);
meta_topic (META_DEBUG_STACK, " xserver_serial: %ld", tracker->xserver_serial);
meta_topic (META_DEBUG_STACK, " verified_stack: ");
stack_dump (tracker, tracker->verified_stack);
meta_topic (META_DEBUG_STACK, " unverified_predictions: [");
@ -259,10 +258,10 @@ meta_stack_tracker_dump (MetaStackTracker *tracker)
MetaStackOp *op = l->data;
meta_stack_op_dump (tracker, op, "", l->next ? ", " : "");
}
meta_topic (META_DEBUG_STACK, "]\n");
meta_topic (META_DEBUG_STACK, "]");
if (tracker->predicted_stack)
{
meta_topic (META_DEBUG_STACK, "\n predicted_stack: ");
meta_topic (META_DEBUG_STACK, " predicted_stack: ");
stack_dump (tracker, tracker->predicted_stack);
}
meta_pop_no_msg_prefix ();
@ -629,7 +628,7 @@ stack_tracker_apply_prediction (MetaStackTracker *tracker,
}
else
{
meta_stack_op_dump (tracker, op, "Predicting: ", "\n");
meta_stack_op_dump (tracker, op, "Predicting: ", "");
g_queue_push_tail (tracker->unverified_predictions, op);
}
@ -714,7 +713,7 @@ stack_tracker_event_received (MetaStackTracker *tracker,
if (op->any.serial < tracker->xserver_serial)
return;
meta_stack_op_dump (tracker, op, "Stack op event received: ", "\n");
meta_stack_op_dump (tracker, op, "Stack op event received: ", "");
/* First we apply any operations that we have queued up that depended
* on X operations *older* than what we received .. those operations

41
src/core/stack.c
View File

@ -78,7 +78,7 @@ on_stack_changed (MetaStack *stack)
GArray *hidden_stack_ids;
GList *sorted;
meta_topic (META_DEBUG_STACK, "Syncing window stack to server\n");
meta_topic (META_DEBUG_STACK, "Syncing window stack to server");
all_root_children_stacked = g_array_new (FALSE, FALSE, sizeof (uint64_t));
hidden_stack_ids = g_array_new (FALSE, FALSE, sizeof (uint64_t));
@ -122,7 +122,6 @@ on_stack_changed (MetaStack *stack)
g_array_append_val (all_root_children_stacked, stack_id);
}
meta_topic (META_DEBUG_STACK, "\n");
meta_pop_no_msg_prefix ();
if (display->x11_display)
@ -137,7 +136,7 @@ on_stack_changed (MetaStack *stack)
/* Sync to server */
meta_topic (META_DEBUG_STACK, "Restacking %u windows\n",
meta_topic (META_DEBUG_STACK, "Restacking %u windows",
all_root_children_stacked->len);
meta_stack_tracker_restack_managed (display->stack_tracker,
@ -275,10 +274,10 @@ meta_stack_add (MetaStack *stack,
g_return_if_fail (meta_window_is_stackable (window));
meta_topic (META_DEBUG_STACK, "Adding window %s to the stack\n", window->desc);
meta_topic (META_DEBUG_STACK, "Adding window %s to the stack", window->desc);
if (meta_window_is_in_stack (window))
meta_bug ("Window %s had stack position already\n", window->desc);
meta_bug ("Window %s had stack position already", window->desc);
stack->sorted = g_list_prepend (stack->sorted, window);
stack->need_resort = TRUE; /* may not be needed as we add to top */
@ -290,7 +289,7 @@ meta_stack_add (MetaStack *stack,
window->stack_position = stack->n_positions;
stack->n_positions += 1;
meta_topic (META_DEBUG_STACK,
"Window %s has stack_position initialized to %d\n",
"Window %s has stack_position initialized to %d",
window->desc, window->stack_position);
meta_stack_changed (stack);
@ -306,7 +305,7 @@ meta_stack_remove (MetaStack *stack,
COGL_TRACE_BEGIN_SCOPED (MetaStackRemove,
"Stack (remove window)");
meta_topic (META_DEBUG_STACK, "Removing window %s from the stack\n", window->desc);
meta_topic (META_DEBUG_STACK, "Removing window %s from the stack", window->desc);
/* Set window to top position, so removing it will not leave gaps
* in the set of positions
@ -576,7 +575,7 @@ create_constraints (Constraint **constraints,
if (!meta_window_is_in_stack (w))
{
meta_topic (META_DEBUG_STACK, "Window %s not in the stack, not constraining it\n",
meta_topic (META_DEBUG_STACK, "Window %s not in the stack, not constraining it",
w->desc);
tmp = tmp->next;
continue;
@ -619,7 +618,8 @@ create_constraints (Constraint **constraints,
if (!meta_window_has_transient_type (group_window))
#endif
{
meta_topic (META_DEBUG_STACK, "Constraining %s above %s as it's transient for its group\n",
meta_topic (META_DEBUG_STACK,
"Constraining %s above %s as it's transient for its group",
w->desc, group_window->desc);
add_constraint (constraints, w, group_window);
}
@ -637,7 +637,8 @@ create_constraints (Constraint **constraints,
if (parent && meta_window_is_in_stack (parent))
{
meta_topic (META_DEBUG_STACK, "Constraining %s above %s due to transiency\n",
meta_topic (META_DEBUG_STACK,
"Constraining %s above %s due to transiency",
w->desc, parent->desc);
add_constraint (constraints, w, parent);
}
@ -728,7 +729,7 @@ ensure_above (MetaWindow *above,
if (is_transient && above->layer < below->layer)
{
meta_topic (META_DEBUG_STACK,
"Promoting window %s from layer %u to %u due to constraint\n",
"Promoting window %s from layer %u to %u due to constraint",
above->desc, above->layer, below->layer);
above->layer = below->layer;
}
@ -739,7 +740,7 @@ ensure_above (MetaWindow *above,
meta_window_set_stack_position_no_sync (above, below->stack_position);
g_assert (below->stack_position + 1 == above->stack_position);
}
meta_topic (META_DEBUG_STACK, "%s above at %d > %s below at %d\n",
meta_topic (META_DEBUG_STACK, "%s above at %d > %s below at %d",
above->desc, above->stack_position,
below->desc, below->stack_position);
}
@ -819,7 +820,7 @@ stack_do_relayer (MetaStack *stack)
return;
meta_topic (META_DEBUG_STACK,
"Recomputing layers\n");
"Recomputing layers");
tmp = stack->sorted;
@ -836,7 +837,7 @@ stack_do_relayer (MetaStack *stack)
if (w->layer != old_layer)
{
meta_topic (META_DEBUG_STACK,
"Window %s moved from layer %u to %u\n",
"Window %s moved from layer %u to %u",
w->desc, old_layer, w->layer);
stack->need_resort = TRUE;
stack->need_constrain = TRUE;
@ -869,7 +870,7 @@ stack_do_constrain (MetaStack *stack)
return;
meta_topic (META_DEBUG_STACK,
"Reapplying constraints\n");
"Reapplying constraints");
constraints = g_new0 (Constraint*,
stack->n_positions);
@ -898,7 +899,7 @@ stack_do_resort (MetaStack *stack)
return;
meta_topic (META_DEBUG_STACK,
"Sorting stack list\n");
"Sorting stack list");
stack->sorted = g_list_sort (stack->sorted,
(GCompareFunc) compare_window_position);
@ -1243,7 +1244,7 @@ meta_stack_set_positions (MetaStack *stack,
if (!lists_contain_same_windows (windows, stack->sorted))
{
meta_warning ("This list of windows has somehow changed; not resetting "
"positions of the windows.\n");
"positions of the windows.");
return;
}
@ -1263,7 +1264,7 @@ meta_stack_set_positions (MetaStack *stack,
}
meta_topic (META_DEBUG_STACK,
"Reset the stack positions of (nearly) all windows\n");
"Reset the stack positions of (nearly) all windows");
meta_stack_changed (stack);
meta_stack_update_window_tile_matches (stack, NULL);
@ -1283,7 +1284,7 @@ meta_window_set_stack_position_no_sync (MetaWindow *window,
if (position == window->stack_position)
{
meta_topic (META_DEBUG_STACK, "Window %s already has position %d\n",
meta_topic (META_DEBUG_STACK, "Window %s already has position %d",
window->desc, position);
return;
}
@ -1319,7 +1320,7 @@ meta_window_set_stack_position_no_sync (MetaWindow *window,
window->stack_position = position;
meta_topic (META_DEBUG_STACK,
"Window %s had stack_position set to %d\n",
"Window %s had stack_position set to %d",
window->desc, window->stack_position);
}

8
src/core/startup-notification.c
View File

@ -135,13 +135,13 @@ meta_startup_notification_update_feedback (MetaStartupNotification *sn)
if (meta_startup_notification_has_pending_sequences (sn))
{
meta_topic (META_DEBUG_STARTUP,
"Setting busy cursor\n");
"Setting busy cursor");
meta_display_set_cursor (display, META_CURSOR_BUSY);
}
else
{
meta_topic (META_DEBUG_STARTUP,
"Setting default cursor\n");
"Setting default cursor");
meta_display_set_cursor (display, META_CURSOR_DEFAULT);
}
}
@ -459,7 +459,7 @@ collect_timed_out_foreach (void *element,
elapsed = ctod->now - timestamp;
meta_topic (META_DEBUG_STARTUP,
"Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n",
"Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s",
elapsed, STARTUP_TIMEOUT_MS,
meta_startup_sequence_get_id (sequence));
@ -485,7 +485,7 @@ startup_sequence_timeout (void *data)
MetaStartupSequence *sequence = l->data;
meta_topic (META_DEBUG_STARTUP,
"Timed out sequence %s\n",
"Timed out sequence %s",
meta_startup_sequence_get_id (sequence));
meta_startup_sequence_complete (sequence);

14
src/core/util.c
View File

@ -79,7 +79,7 @@ ensure_logfile (void)
if (err != NULL)
{
meta_warning ("Failed to open debug log: %s\n",
meta_warning ("Failed to open debug log: %s",
err->message);
g_error_free (err);
return;
@ -89,13 +89,13 @@ ensure_logfile (void)
if (logfile == NULL)
{
meta_warning ("Failed to fdopen() log file %s: %s\n",
meta_warning ("Failed to fdopen() log file %s: %s",
filename, strerror (errno));
close (fd);
}
else
{
g_printerr ("Opened log file %s\n", filename);
g_printerr ("Opened log file %s", filename);
}
g_free (filename);
@ -114,7 +114,7 @@ meta_set_verbose (gboolean setting)
{
#ifndef WITH_VERBOSE_MODE
if (setting)
meta_fatal (_("Mutter was compiled without support for verbose mode\n"));
meta_fatal (_("Mutter was compiled without support for verbose mode"));
#endif
if (setting)
@ -314,6 +314,7 @@ meta_topic_real_valist (MetaDebugTopic topic,
}
utf8_fputs (str, out);
utf8_fputs ("\n", out);
fflush (out);
@ -355,6 +356,7 @@ meta_bug (const char *format, ...)
if (no_prefix == 0)
utf8_fputs ("Bug in window manager: ", out);
utf8_fputs (str, out);
utf8_fputs ("\n", out);
fflush (out);
@ -386,6 +388,7 @@ meta_warning (const char *format, ...)
if (no_prefix == 0)
utf8_fputs ("Window manager warning: ", out);
utf8_fputs (str, out);
utf8_fputs ("\n", out);
fflush (out);
@ -416,6 +419,7 @@ meta_fatal (const char *format, ...)
if (no_prefix == 0)
utf8_fputs ("Window manager error: ", out);
utf8_fputs (str, out);
utf8_fputs ("\n", out);
fflush (out);
@ -647,7 +651,7 @@ meta_show_dialog (const char *type,
if (error)
{
meta_warning ("%s\n", error->message);
meta_warning ("%s", error->message);
g_error_free (error);
}

162
src/core/window.c
View File

@ -983,7 +983,7 @@ _meta_window_shared_new (MetaDisplay *display,
g_assert (attrs != NULL);
meta_verbose ("attrs->map_state = %d (%s)\n",
meta_verbose ("attrs->map_state = %d (%s)",
attrs->map_state,
(attrs->map_state == IsUnmapped) ?
"IsUnmapped" :
@ -1203,14 +1203,14 @@ _meta_window_shared_new (MetaDisplay *display,
{
/* WM_HINTS said minimized */
window->minimized = TRUE;
meta_verbose ("Window %s asked to start out minimized\n", window->desc);
meta_verbose ("Window %s asked to start out minimized", window->desc);
}
if (existing_wm_state == IconicState)
{
/* WM_STATE said minimized */
window->minimized = TRUE;
meta_verbose ("Window %s had preexisting WM_STATE = IconicState, minimizing\n",
meta_verbose ("Window %s had preexisting WM_STATE = IconicState, minimizing",
window->desc);
/* Assume window was previously placed, though perhaps it's
@ -1279,7 +1279,7 @@ _meta_window_shared_new (MetaDisplay *display,
if (window->initial_workspace == (int) 0xFFFFFFFF)
{
meta_topic (META_DEBUG_PLACEMENT,
"Window %s is initially on all spaces\n",
"Window %s is initially on all spaces",
window->desc);
/* need to set on_all_workspaces first so that it will be
@ -1292,7 +1292,7 @@ _meta_window_shared_new (MetaDisplay *display,
else if (!on_all_workspaces)
{
meta_topic (META_DEBUG_PLACEMENT,
"Window %s is initially on space %d\n",
"Window %s is initially on space %d",
window->desc, window->initial_workspace);
workspace = meta_workspace_manager_get_workspace_by_index (workspace_manager,
@ -1316,7 +1316,7 @@ _meta_window_shared_new (MetaDisplay *display,
if (window->transient_for != NULL)
{
meta_topic (META_DEBUG_PLACEMENT,
"Putting window %s on same workspace as parent %s\n",
"Putting window %s on same workspace as parent %s",
window->desc, window->transient_for->desc);
g_warn_if_fail (!window->transient_for->override_redirect);
@ -1327,7 +1327,7 @@ _meta_window_shared_new (MetaDisplay *display,
else if (window->on_all_workspaces)
{
meta_topic (META_DEBUG_PLACEMENT,
"Putting window %s on all workspaces\n",
"Putting window %s on all workspaces",
window->desc);
set_workspace_state (window, TRUE, NULL);
@ -1335,7 +1335,7 @@ _meta_window_shared_new (MetaDisplay *display,
else
{
meta_topic (META_DEBUG_PLACEMENT,
"Putting window %s on active workspace\n",
"Putting window %s on active workspace",
window->desc);
set_workspace_state (window, FALSE, workspace_manager->active_workspace);
@ -1441,7 +1441,7 @@ meta_window_unmanage (MetaWindow *window,
MetaWorkspaceManager *workspace_manager = window->display->workspace_manager;
GList *tmp;
meta_verbose ("Unmanaging %s\n", window->desc);
meta_verbose ("Unmanaging %s", window->desc);
window->unmanaging = TRUE;
g_clear_handle_id (&window->unmanage_idle_id, g_source_remove);
@ -1461,7 +1461,7 @@ meta_window_unmanage (MetaWindow *window,
window->known_to_compositor = FALSE;
if (destroying_windows_disallowed > 0)
meta_bug ("Tried to destroy window %s while destruction was not allowed\n",
meta_bug ("Tried to destroy window %s while destruction was not allowed",
window->desc);
meta_display_unregister_stamp (window->display, window->stamp);
@ -1519,7 +1519,7 @@ meta_window_unmanage (MetaWindow *window,
if (window->has_focus)
{
meta_topic (META_DEBUG_FOCUS,
"Focusing default window since we're unmanaging %s\n",
"Focusing default window since we're unmanaging %s",
window->desc);
meta_workspace_focus_default_window (workspace_manager->active_workspace,
window,
@ -1528,7 +1528,7 @@ meta_window_unmanage (MetaWindow *window,
else
{
meta_topic (META_DEBUG_FOCUS,
"Unmanaging window %s which doesn't currently have focus\n",
"Unmanaging window %s which doesn't currently have focus",
window->desc);
}
@ -1540,7 +1540,7 @@ meta_window_unmanage (MetaWindow *window,
window->struts = NULL;
meta_topic (META_DEBUG_WORKAREA,
"Unmanaging window %s which has struts, so invalidating work areas\n",
"Unmanaging window %s which has struts, so invalidating work areas",
window->desc);
invalidate_work_areas (window);
}
@ -1706,7 +1706,7 @@ meta_window_showing_on_its_workspace (MetaWindow *window)
workspace_of_window && workspace_of_window->showing_desktop &&
!is_desktop_or_dock)
{
meta_verbose ("We're showing the desktop on the workspace(s) that window %s is on\n",
meta_verbose ("We're showing the desktop on the workspace(s) that window %s is on",
window->desc);
showing = FALSE;
}
@ -1747,7 +1747,7 @@ implement_showing (MetaWindow *window,
gboolean showing)
{
/* Actually show/hide the window */
meta_verbose ("Implement showing = %d for window %s\n",
meta_verbose ("Implement showing = %d for window %s",
showing, window->desc);
/* Some windows are not stackable until being showed, so add those now. */
@ -1809,7 +1809,7 @@ idle_calc_showing (gpointer data)
g_return_val_if_fail (queue_pending[queue_index] != NULL, FALSE);
meta_topic (META_DEBUG_WINDOW_STATE,
"Clearing the calc_showing queue\n");
"Clearing the calc_showing queue");
/* Work with a copy, for reentrancy. The allowed reentrancy isn't
* complete; destroying a window while we're in here would result in
@ -1959,7 +1959,7 @@ meta_window_unqueue (MetaWindow *window, guint queuebits)
{
meta_topic (META_DEBUG_WINDOW_STATE,
"Removing %s from the %s queue\n",
"Removing %s from the %s queue",
window->desc,
meta_window_queue_names[queuenum]);
@ -2036,7 +2036,7 @@ meta_window_queue (MetaWindow *window, guint queuebits)
break;
meta_topic (META_DEBUG_WINDOW_STATE,
"Putting %s in the %s queue\n",
"Putting %s in the %s queue",
window->desc,
meta_window_queue_names[queuenum]);
@ -2078,7 +2078,7 @@ intervening_user_event_occurred (MetaWindow *window)
" net_wm_user_time_set : %d\n"
" net_wm_user_time : %u\n"
" initial_timestamp_set: %d\n"
" initial_timestamp : %u\n",
" initial_timestamp : %u",
window->net_wm_user_time_set,
window->net_wm_user_time,
window->initial_timestamp_set,
@ -2089,7 +2089,7 @@ intervening_user_event_occurred (MetaWindow *window)
"COMPARISON (continued):\n"
" focus_window : %s\n"
" fw->net_wm_user_time_set : %d\n"
" fw->net_wm_user_time : %u\n",
" fw->net_wm_user_time : %u",
focus_window->desc,
focus_window->net_wm_user_time_set,
focus_window->net_wm_user_time);
@ -2107,7 +2107,7 @@ intervening_user_event_occurred (MetaWindow *window)
(window->initial_timestamp == 0)))
{
meta_topic (META_DEBUG_STARTUP,
"window %s explicitly requested no focus\n",
"window %s explicitly requested no focus",
window->desc);
return TRUE;
}
@ -2115,7 +2115,7 @@ intervening_user_event_occurred (MetaWindow *window)
if (!(window->net_wm_user_time_set) && !(window->initial_timestamp_set))
{
meta_topic (META_DEBUG_STARTUP,
"no information about window %s found\n",
"no information about window %s found",
window->desc);
return FALSE;
}
@ -2124,7 +2124,7 @@ intervening_user_event_occurred (MetaWindow *window)
!focus_window->net_wm_user_time_set)
{
meta_topic (META_DEBUG_STARTUP,
"focus window, %s, doesn't have a user time set yet!\n",
"focus window, %s, doesn't have a user time set yet!",
window->desc);
return FALSE;
}
@ -2153,7 +2153,7 @@ intervening_user_event_occurred (MetaWindow *window)
XSERVER_TIME_IS_BEFORE (compare, focus_window->net_wm_user_time))
{
meta_topic (META_DEBUG_STARTUP,
"window %s focus prevented by other activity; %u < %u\n",
"window %s focus prevented by other activity; %u < %u",
window->desc,
compare,
focus_window->net_wm_user_time);
@ -2162,7 +2162,7 @@ intervening_user_event_occurred (MetaWindow *window)
else
{
meta_topic (META_DEBUG_STARTUP,
"new window %s with no intervening events\n",
"new window %s with no intervening events",
window->desc);
return FALSE;
}
@ -2255,7 +2255,7 @@ window_state_on_map (MetaWindow *window,
window))
{
meta_topic (META_DEBUG_FOCUS,
"focus_window is terminal; not focusing new window.\n");
"focus_window is terminal; not focusing new window.");
*takes_focus = FALSE;
*places_on_top = FALSE;
}
@ -2396,7 +2396,7 @@ meta_window_show (MetaWindow *window)
MetaDisplay *display = window->display;
meta_topic (META_DEBUG_WINDOW_STATE,
"Showing window %s, shaded: %d iconic: %d placed: %d\n",
"Showing window %s, shaded: %d iconic: %d placed: %d",
window->desc, window->shaded, window->iconic, window->placed);
focus_window = window->display->focus_window; /* May be NULL! */
@ -2405,7 +2405,7 @@ meta_window_show (MetaWindow *window)
needs_stacking_adjustment = FALSE;
meta_topic (META_DEBUG_WINDOW_STATE,
"Window %s %s focus on map, and %s place on top on map.\n",
"Window %s %s focus on map, and %s place on top on map.",
window->desc,
takes_focus_on_map ? "does" : "does not",
place_on_top_on_map ? "does" : "does not");
@ -2577,7 +2577,7 @@ meta_window_show (MetaWindow *window)
if (did_show && window->struts)
{
meta_topic (META_DEBUG_WORKAREA,
"Mapped window %s with struts, so invalidating work areas\n",
"Mapped window %s with struts, so invalidating work areas",
window->desc);
invalidate_work_areas (window);
}
@ -2612,7 +2612,7 @@ meta_window_hide (MetaWindow *window)
gboolean did_hide;
meta_topic (META_DEBUG_WINDOW_STATE,
"Hiding window %s\n", window->desc);
"Hiding window %s", window->desc);
if (window->visible_to_compositor)
{
@ -2658,7 +2658,7 @@ meta_window_hide (MetaWindow *window)
if (did_hide && window->struts)
{
meta_topic (META_DEBUG_WORKAREA,
"Unmapped window %s with struts, so invalidating work areas\n",
"Unmapped window %s with struts, so invalidating work areas",
window->desc);
invalidate_work_areas (window);
}
@ -2718,13 +2718,13 @@ meta_window_minimize (MetaWindow *window)
if (window->has_focus)
{
meta_topic (META_DEBUG_FOCUS,
"Focusing default window due to minimization of focus window %s\n",
"Focusing default window due to minimization of focus window %s",
window->desc);
}
else
{
meta_topic (META_DEBUG_FOCUS,
"Minimizing window %s which doesn't have the focus\n",
"Minimizing window %s which doesn't have the focus",
window->desc);
}
@ -2815,7 +2815,7 @@ meta_window_maximize_internal (MetaWindow *window,
g_assert (maximize_horizontally || maximize_vertically);
meta_topic (META_DEBUG_WINDOW_OPS,
"Maximizing %s%s\n",
"Maximizing %s%s",
window->desc,
maximize_horizontally && maximize_vertically ? "" :
maximize_horizontally ? " horizontally" :
@ -3243,7 +3243,7 @@ static void
unmaximize_window_before_freeing (MetaWindow *window)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Unmaximizing %s just before freeing\n",
"Unmaximizing %s just before freeing",
window->desc);
window->maximized_horizontally = FALSE;
@ -3308,7 +3308,7 @@ meta_window_unmaximize (MetaWindow *window,
window->tile_mode = META_TILE_NONE;
meta_topic (META_DEBUG_WINDOW_OPS,
"Unmaximizing %s%s\n",
"Unmaximizing %s%s",
window->desc,
unmaximize_horizontally && unmaximize_vertically ? "" :
unmaximize_horizontally ? " horizontally" :
@ -3448,7 +3448,7 @@ meta_window_make_fullscreen_internal (MetaWindow *window)
if (!window->fullscreen)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Fullscreening %s\n", window->desc);
"Fullscreening %s", window->desc);
if (window->shaded)
{
@ -3515,7 +3515,7 @@ meta_window_unmake_fullscreen (MetaWindow *window)
MetaRectangle old_frame_rect, old_buffer_rect, target_rect;
meta_topic (META_DEBUG_WINDOW_OPS,
"Unfullscreening %s\n", window->desc);
"Unfullscreening %s", window->desc);
window->fullscreen = FALSE;
target_rect = window->saved_rect;
@ -3611,7 +3611,7 @@ meta_window_shade (MetaWindow *window,
g_return_if_fail (!window->override_redirect);
meta_topic (META_DEBUG_WINDOW_OPS,
"Shading %s\n", window->desc);
"Shading %s", window->desc);
if (!window->shaded)
{
window->shaded = TRUE;
@ -3623,7 +3623,7 @@ meta_window_shade (MetaWindow *window,
* and we need to focus the frame
*/
meta_topic (META_DEBUG_FOCUS,
"Re-focusing window %s after shading it\n",
"Re-focusing window %s after shading it",
window->desc);
meta_window_focus (window, timestamp);
@ -3638,7 +3638,7 @@ meta_window_unshade (MetaWindow *window,
g_return_if_fail (!window->override_redirect);
meta_topic (META_DEBUG_WINDOW_OPS,
"Unshading %s\n", window->desc);
"Unshading %s", window->desc);
if (window->shaded)
{
window->shaded = FALSE;
@ -3647,7 +3647,7 @@ meta_window_unshade (MetaWindow *window,
/* focus the window */
meta_topic (META_DEBUG_FOCUS,
"Focusing window %s after unshading it\n",
"Focusing window %s after unshading it",
window->desc);
meta_window_focus (window, timestamp);
@ -3687,7 +3687,7 @@ meta_window_activate_full (MetaWindow *window,
meta_topic (META_DEBUG_FOCUS,
"_NET_ACTIVE_WINDOW message sent for %s at time %u "
"by client type %u.\n",
"by client type %u.",
window->desc, timestamp, source_indication);
allow_workspace_switch = (timestamp != 0);
@ -3696,7 +3696,7 @@ meta_window_activate_full (MetaWindow *window,
{
meta_topic (META_DEBUG_FOCUS,
"last_user_time (%u) is more recent; ignoring "
" _NET_ACTIVE_WINDOW message.\n",
" _NET_ACTIVE_WINDOW message.",
window->display->last_user_time);
meta_window_set_demands_attention(window);
return;
@ -3742,7 +3742,7 @@ meta_window_activate_full (MetaWindow *window,
meta_window_raise (window);
meta_topic (META_DEBUG_FOCUS,
"Focusing window %s due to activation\n",
"Focusing window %s due to activation",
window->desc);
if (meta_window_located_on_workspace (window, workspace))
@ -4368,7 +4368,7 @@ idle_move_resize (gpointer data)
GSList *copy;
guint queue_index = GPOINTER_TO_INT (data);
meta_topic (META_DEBUG_GEOMETRY, "Clearing the move_resize queue\n");
meta_topic (META_DEBUG_GEOMETRY, "Clearing the move_resize queue");
/* Work with a copy, for reentrancy. The allowed reentrancy isn't
* complete; destroying a window while we're in here would result in
@ -4753,7 +4753,7 @@ meta_window_focus (MetaWindow *window,
window->restore_focus_on_map = FALSE;
meta_topic (META_DEBUG_FOCUS,
"Setting input focus to window %s, input: %d focusable: %d\n",
"Setting input focus to window %s, input: %d focusable: %d",
window->desc, window->input, meta_window_is_focusable (window));
if (window->display->grab_window &&
@ -4762,7 +4762,7 @@ meta_window_focus (MetaWindow *window,
!window->display->grab_window->unmanaging)
{
meta_topic (META_DEBUG_FOCUS,
"Current focus window %s has global keygrab, not focusing window %s after all\n",
"Current focus window %s has global keygrab, not focusing window %s after all",
window->display->grab_window->desc, window->desc);
return;
}
@ -4773,7 +4773,7 @@ meta_window_focus (MetaWindow *window,
meta_window_transient_can_focus (modal_transient))
{
meta_topic (META_DEBUG_FOCUS,
"%s has %s as a modal transient, so focusing it instead.\n",
"%s has %s as a modal transient, so focusing it instead.",
window->desc, modal_transient->desc);
if (!meta_window_located_on_workspace (modal_transient, workspace_manager->active_workspace))
meta_window_change_workspace (modal_transient, workspace_manager->active_workspace);
@ -4785,7 +4785,7 @@ meta_window_focus (MetaWindow *window,
if ((!window->mapped || window->hidden) && !window->shaded)
{
meta_topic (META_DEBUG_FOCUS,
"Window %s is not showing, not focusing after all\n",
"Window %s is not showing, not focusing after all",
window->desc);
return;
}
@ -4976,7 +4976,7 @@ meta_window_change_workspace (MetaWindow *window,
static void
window_stick_impl (MetaWindow *window)
{
meta_verbose ("Sticking window %s current on_all_workspaces = %d\n",
meta_verbose ("Sticking window %s current on_all_workspaces = %d",
window->desc, window->on_all_workspaces);
if (window->on_all_workspaces_requested)
@ -5091,7 +5091,7 @@ meta_window_raise (MetaWindow *window)
ancestor = meta_window_find_root_ancestor (window);
meta_topic (META_DEBUG_WINDOW_OPS,
"Raising window %s, ancestor of %s\n",
"Raising window %s, ancestor of %s",
ancestor->desc, window->desc);
/* Raise the ancestor of the window (if the window has no ancestor,
@ -5110,7 +5110,7 @@ meta_window_raise (MetaWindow *window)
meta_warning (
"Either stacks aren't per screen or some window has a weird "
"transient_for hint; window->display->stack != "
"ancestor->screen->stack. window = %s, ancestor = %s.\n",
"ancestor->screen->stack. window = %s, ancestor = %s.",
window->desc, ancestor->desc);
/* We could raise the window here, but don't want to do that twice and
* so we let the case below handle that.
@ -5134,7 +5134,7 @@ meta_window_lower (MetaWindow *window)
g_return_if_fail (!window->override_redirect);
meta_topic (META_DEBUG_WINDOW_OPS,
"Lowering window %s\n", window->desc);
"Lowering window %s", window->desc);
meta_stack_lower (window->display->stack, window);
}
@ -5452,7 +5452,7 @@ idle_update_icon (gpointer data)
GSList *copy;
guint queue_index = GPOINTER_TO_INT (data);
meta_topic (META_DEBUG_GEOMETRY, "Clearing the update_icon queue\n");
meta_topic (META_DEBUG_GEOMETRY, "Clearing the update_icon queue");
/* Work with a copy, for reentrancy. The allowed reentrancy isn't
* complete; destroying a window while we're in here would result in
@ -5671,7 +5671,7 @@ meta_window_recalc_features (MetaWindow *window)
* about these apps but make them work.
*/
meta_warning ("Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n",
meta_warning ("Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.",
window->desc,
window->size_hints.min_width,
window->size_hints.min_height,
@ -5767,7 +5767,7 @@ meta_window_recalc_features (MetaWindow *window)
}
meta_topic (META_DEBUG_WINDOW_OPS,
"Window %s fullscreen = %d not resizable, maximizable = %d fullscreenable = %d min size %dx%d max size %dx%d\n",
"Window %s fullscreen = %d not resizable, maximizable = %d fullscreenable = %d min size %dx%d max size %dx%d",
window->desc,
window->fullscreen,
window->has_maximize_func, window->has_fullscreen_func,
@ -5788,7 +5788,7 @@ meta_window_recalc_features (MetaWindow *window)
window->has_minimize_func = FALSE;
meta_topic (META_DEBUG_WINDOW_OPS,
"Window %s decorated = %d border_only = %d has_close = %d has_minimize = %d has_maximize = %d has_move = %d has_shade = %d skip_taskbar = %d skip_pager = %d\n",
"Window %s decorated = %d border_only = %d has_close = %d has_minimize = %d has_maximize = %d has_move = %d has_shade = %d skip_taskbar = %d skip_pager = %d",
window->desc,
window->decorated,
window->border_only,
@ -5958,7 +5958,7 @@ check_moveresize_frequency (MetaWindow *window,
if (elapsed >= 0.0 && elapsed < ms_between_resizes)
{
meta_topic (META_DEBUG_RESIZING,
"Delaying move/resize as only %g of %g ms elapsed\n",
"Delaying move/resize as only %g of %g ms elapsed",
elapsed, ms_between_resizes);
if (remaining)
@ -5968,7 +5968,7 @@ check_moveresize_frequency (MetaWindow *window,
}
meta_topic (META_DEBUG_RESIZING,
" Checked moveresize freq, allowing move/resize now (%g of %g seconds elapsed)\n",
" Checked moveresize freq, allowing move/resize now (%g of %g seconds elapsed)",
elapsed / 1000.0, 1.0 / max_resizes_per_second);
return TRUE;
@ -6063,7 +6063,7 @@ update_move (MetaWindow *window,
new_x = display->grab_anchor_window_pos.x + dx;
new_y = display->grab_anchor_window_pos.y + dy;
meta_verbose ("x,y = %d,%d anchor ptr %d,%d anchor pos %d,%d dx,dy %d,%d\n",
meta_verbose ("x,y = %d,%d anchor ptr %d,%d anchor pos %d,%d dx,dy %d,%d",
x, y,
display->grab_anchor_root_x,
display->grab_anchor_root_y,
@ -6541,7 +6541,7 @@ meta_window_get_work_area_for_logical_monitor (MetaWindow *window,
}
meta_topic (META_DEBUG_WORKAREA,
"Window %s monitor %d has work area %d,%d %d x %d\n",
"Window %s monitor %d has work area %d,%d %d x %d",
window->desc, logical_monitor->number,
area->x, area->y, area->width, area->height);
}
@ -6623,7 +6623,7 @@ meta_window_get_work_area_all_monitors (MetaWindow *window,
}
meta_topic (META_DEBUG_WORKAREA,
"Window %s has whole-screen work area %d,%d %d x %d\n",
"Window %s has whole-screen work area %d,%d %d x %d",
window->desc, area->x, area->y, area->width, area->height);
}
@ -6634,7 +6634,7 @@ meta_window_get_current_tile_monitor_number (MetaWindow *window)
if (tile_monitor_number < 0)
{
meta_warning ("%s called with an invalid monitor number; using 0 instead\n", G_STRFUNC);
meta_warning ("%s called with an invalid monitor number; using 0 instead", G_STRFUNC);
tile_monitor_number = 0;
}
@ -6864,7 +6864,7 @@ warp_grab_pointer (MetaWindow *window,
meta_x11_error_trap_push (display->x11_display);
meta_topic (META_DEBUG_WINDOW_OPS,
"Warping pointer to %d,%d with window at %d,%d\n",
"Warping pointer to %d,%d with window at %d,%d",
*x, *y, rect.x, rect.y);
/* Need to update the grab positions so that the MotionNotify and other
@ -6887,7 +6887,7 @@ warp_grab_pointer (MetaWindow *window,
if (meta_x11_error_trap_pop_with_return (display->x11_display) != Success)
{
meta_verbose ("Failed to warp pointer for window %s\n",
meta_verbose ("Failed to warp pointer for window %s",
window->desc);
return FALSE;
}
@ -7026,7 +7026,7 @@ meta_window_stack_just_below (MetaWindow *window,
if (window->stack_position > below_this_one->stack_position)
{
meta_topic (META_DEBUG_STACK,
"Setting stack position of window %s to %d (making it below window %s).\n",
"Setting stack position of window %s to %d (making it below window %s).",
window->desc,
below_this_one->stack_position,
below_this_one->desc);
@ -7035,7 +7035,7 @@ meta_window_stack_just_below (MetaWindow *window,
else
{
meta_topic (META_DEBUG_STACK,
"Window %s was already below window %s.\n",
"Window %s was already below window %s.",
window->desc, below_this_one->desc);
}
}
@ -7050,7 +7050,7 @@ meta_window_stack_just_above (MetaWindow *window,
if (window->stack_position < above_this_one->stack_position)
{
meta_topic (META_DEBUG_STACK,
"Setting stack position of window %s to %d (making it above window %s).\n",
"Setting stack position of window %s to %d (making it above window %s).",
window->desc,
above_this_one->stack_position,
above_this_one->desc);
@ -7059,7 +7059,7 @@ meta_window_stack_just_above (MetaWindow *window,
else
{
meta_topic (META_DEBUG_STACK,
"Window %s was already above window %s.\n",
"Window %s was already above window %s.",
window->desc, above_this_one->desc);
}
}
@ -7102,13 +7102,13 @@ meta_window_set_user_time (MetaWindow *window,
{
meta_topic (META_DEBUG_STARTUP,
"Window %s _NET_WM_USER_TIME not updated to %u, because it "
"is less than %u\n",
"is less than %u",
window->desc, timestamp, window->net_wm_user_time);
}
else
{
meta_topic (META_DEBUG_STARTUP,
"Window %s has _NET_WM_USER_TIME of %u\n",
"Window %s has _NET_WM_USER_TIME of %u",
window->desc, timestamp);
window->net_wm_user_time_set = TRUE;
window->net_wm_user_time = timestamp;
@ -7199,7 +7199,7 @@ meta_window_set_demands_attention (MetaWindow *window)
if (obscured)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Marking %s as needing attention\n",
"Marking %s as needing attention",
window->desc);
window->wm_state_demands_attention = TRUE;
@ -7214,7 +7214,7 @@ meta_window_set_demands_attention (MetaWindow *window)
meta_topic (META_DEBUG_WINDOW_OPS,
"Not marking %s as needing attention because "
"it's in full view\n",
"it's in full view",
window->desc);
}
}
@ -7223,7 +7223,7 @@ void
meta_window_unset_demands_attention (MetaWindow *window)
{
meta_topic (META_DEBUG_WINDOW_OPS,
"Marking %s as not needing attention\n", window->desc);
"Marking %s as not needing attention", window->desc);
if (window->wm_state_demands_attention)
{
@ -7990,7 +7990,7 @@ meta_window_set_transient_for (MetaWindow *window,
{
if (check_transient_for_loop (window, parent))
{
meta_warning ("Setting %s transient for %s would create a loop.\n",
meta_warning ("Setting %s transient for %s would create a loop.",
window->desc, parent->desc);
return;
}
@ -8096,14 +8096,14 @@ mouse_mode_focus (MetaWindow *window,
if (window->type != META_WINDOW_DESKTOP)
{
meta_topic (META_DEBUG_FOCUS,
"Focusing %s at time %u.\n", window->desc, timestamp);
"Focusing %s at time %u.", window->desc, timestamp);
meta_window_focus (window, timestamp);
if (meta_prefs_get_auto_raise ())
meta_display_queue_autoraise_callback (display, window);
else
meta_topic (META_DEBUG_FOCUS, "Auto raise is disabled\n");
meta_topic (META_DEBUG_FOCUS, "Auto raise is disabled");
}
else
{
@ -8121,7 +8121,7 @@ mouse_mode_focus (MetaWindow *window,
{
meta_topic (META_DEBUG_FOCUS,
"Unsetting focus from %s due to mouse entering "
"the DESKTOP window\n",
"the DESKTOP window",
display->focus_window->desc);
meta_display_unset_input_focus (display, timestamp);
}
@ -8335,7 +8335,7 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
if (window->type != META_WINDOW_DOCK)
{
meta_topic (META_DEBUG_FOCUS,
"Focusing %s due to button %u press (display.c)\n",
"Focusing %s due to button %u press (display.c)",
window->desc, button);
meta_window_focus (window, event->any.time);
meta_window_check_alive (window, event->any.time);
@ -8383,7 +8383,7 @@ meta_window_handle_ungrabbed_event (MetaWindow *window,
meta_window_raise (window);
else
meta_topic (META_DEBUG_FOCUS,
"Not raising window on click due to don't-raise-on-click option\n");
"Not raising window on click due to don't-raise-on-click option");
}
else if (is_window_grab && (int) button == meta_prefs_get_mouse_button_resize ())
{

48
src/core/workspace.c
View File

@ -380,7 +380,7 @@ meta_workspace_add_window (MetaWorkspace *workspace,
if (window->struts)
{
meta_topic (META_DEBUG_WORKAREA,
"Invalidating work area of workspace %d since we're adding window %s to it\n",
"Invalidating work area of workspace %d since we're adding window %s to it",
meta_workspace_index (workspace), window->desc);
meta_workspace_invalidate_work_area (workspace);
}
@ -404,7 +404,7 @@ meta_workspace_remove_window (MetaWorkspace *workspace,
if (window->struts)
{
meta_topic (META_DEBUG_WORKAREA,
"Invalidating work area of workspace %d since we're removing window %s from it\n",
"Invalidating work area of workspace %d since we're removing window %s from it",
meta_workspace_index (workspace), window->desc);
meta_workspace_invalidate_work_area (workspace);
}
@ -470,7 +470,7 @@ workspace_switch_sound(MetaWorkspace *from,
if (i >= nw)
{
meta_bug("Failed to find destination workspace in layout\n");
meta_bug("Failed to find destination workspace in layout");
goto finish;
}
@ -494,7 +494,7 @@ workspace_switch_sound(MetaWorkspace *from,
e = "desktop-switch-down";
else
{
meta_bug("Uh, origin and destination workspace at same logic position!\n");
meta_bug("Uh, origin and destination workspace at same logic position!");
goto finish;
}
@ -536,7 +536,7 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
gint num_workspaces, current_space, new_space;
MetaMotionDirection direction;
meta_verbose ("Activating workspace %d\n",
meta_verbose ("Activating workspace %d",
meta_workspace_index (workspace));
if (workspace->manager->active_workspace == workspace)
@ -664,7 +664,7 @@ meta_workspace_activate_with_focus (MetaWorkspace *workspace,
}
else
{
meta_topic (META_DEBUG_FOCUS, "Focusing default window on new workspace\n");
meta_topic (META_DEBUG_FOCUS, "Focusing default window on new workspace");
meta_workspace_focus_default_window (workspace, NULL, timestamp);
}
@ -687,7 +687,7 @@ meta_workspace_index (MetaWorkspace *workspace)
ret = g_list_index (workspace->manager->workspaces, workspace);
if (ret < 0)
meta_bug ("Workspace does not exist to index!\n");
meta_bug ("Workspace does not exist to index!");
return ret;
}
@ -746,13 +746,13 @@ meta_workspace_invalidate_work_area (MetaWorkspace *workspace)
if (workspace->work_areas_invalid)
{
meta_topic (META_DEBUG_WORKAREA,
"Work area for workspace %d is already invalid\n",
"Work area for workspace %d is already invalid",
meta_workspace_index (workspace));
return;
}
meta_topic (META_DEBUG_WORKAREA,
"Invalidating work area for workspace %d\n",
"Invalidating work area for workspace %d",
meta_workspace_index (workspace));
/* If we are in the middle of a resize or move operation, we
@ -922,7 +922,7 @@ ensure_work_areas_validated (MetaWorkspace *workspace)
}
workspace->work_area_screen = work_area;
meta_topic (META_DEBUG_WORKAREA,
"Computed work area for workspace %d: %d,%d %d x %d\n",
"Computed work area for workspace %d: %d,%d %d x %d",
meta_workspace_index (workspace),
workspace->work_area_screen.x,
workspace->work_area_screen.y,
@ -953,7 +953,7 @@ ensure_work_areas_validated (MetaWorkspace *workspace)
meta_topic (META_DEBUG_WORKAREA,
"Computed work area for workspace %d "
"monitor %d: %d,%d %d x %d\n",
"monitor %d: %d,%d %d x %d",
meta_workspace_index (workspace),
logical_monitor->number,
data->logical_monitor_work_area.x,
@ -1227,7 +1227,7 @@ meta_workspace_get_neighbor (MetaWorkspace *workspace,
meta_workspace_manager_calc_workspace_layout (workspace->manager, num_workspaces,
current_space, &layout);
meta_verbose ("Getting neighbor of %d in direction %s\n",
meta_verbose ("Getting neighbor of %d in direction %s",
current_space, meta_motion_direction_to_string (direction));
ltr = (meta_get_locale_direction () == META_LOCALE_DIRECTION_LTR);
@ -1264,10 +1264,10 @@ meta_workspace_get_neighbor (MetaWorkspace *workspace,
i = current_space;
if (i >= num_workspaces)
meta_bug ("calc_workspace_layout left an invalid (too-high) workspace number %d in the grid\n",
meta_bug ("calc_workspace_layout left an invalid (too-high) workspace number %d in the grid",
i);
meta_verbose ("Neighbor workspace is %d at row %d col %d\n",
meta_verbose ("Neighbor workspace is %d at row %d col %d",
i, layout.current_row, layout.current_col);
meta_workspace_manager_free_workspace_layout (&layout);
@ -1288,7 +1288,7 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
{
if (timestamp == META_CURRENT_TIME)
meta_warning ("META_CURRENT_TIME used to choose focus window; "
"focus window may not be correct.\n");
"focus window may not be correct.");
if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK ||
!workspace->display->mouse_mode)
@ -1312,12 +1312,13 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
*/
meta_topic (META_DEBUG_FOCUS,
"Not focusing mouse window %s because EnterNotify events should handle that\n", window->desc);
"Not focusing mouse window %s because EnterNotify events should handle that",
window->desc);
}
else
{
meta_topic (META_DEBUG_FOCUS,
"Focusing mouse window %s\n", window->desc);
"Focusing mouse window %s", window->desc);
meta_window_focus (window, timestamp);
}
@ -1333,7 +1334,7 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace,
{
meta_topic (META_DEBUG_FOCUS,
"Setting focus to no_focus_window, since no valid "
"window to focus found.\n");
"window to focus found.");
meta_display_unset_input_focus (workspace->display, timestamp);
}
}
@ -1366,10 +1367,10 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
if (not_this_one)
meta_topic (META_DEBUG_FOCUS,
"Focusing MRU window excluding %s\n", not_this_one->desc);
"Focusing MRU window excluding %s", not_this_one->desc);
else
meta_topic (META_DEBUG_FOCUS,
"Focusing MRU window\n");
"Focusing MRU window");
/* First, check to see if we need to focus an ancestor of a window */
if (not_this_one)
@ -1386,7 +1387,7 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
if (ancestor)
{
meta_topic (META_DEBUG_FOCUS,
"Focusing %s, ancestor of %s\n",
"Focusing %s, ancestor of %s",
ancestor->desc, not_this_one->desc);
meta_window_focus (ancestor, timestamp);
@ -1406,7 +1407,7 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
if (window)
{
meta_topic (META_DEBUG_FOCUS,
"Focusing workspace MRU window %s\n", window->desc);
"Focusing workspace MRU window %s", window->desc);
meta_window_focus (window, timestamp);
@ -1416,7 +1417,8 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
}
else
{
meta_topic (META_DEBUG_FOCUS, "No MRU window to focus found; focusing no_focus_window.\n");
meta_topic (META_DEBUG_FOCUS,
"No MRU window to focus found; focusing no_focus_window.");
meta_display_unset_input_focus (workspace->display, timestamp);
}
}