diff options
author | Jonas Ådahl <jadahl@gmail.com> | 2020-10-02 17:47:22 +0200 |
---|---|---|
committer | Jonas Ådahl <jadahl@gmail.com> | 2020-10-08 16:38:41 +0200 |
commit | 313e3e771c2b54e9ee4d5b043ea866763cf2e85e (patch) | |
tree | 0e667180b09863c18a7937db17605785d157df0c | |
parent | dbe44f3a83e6a6bdc611bb298e3781a0aebbbd7b (diff) | |
download | mutter-313e3e771c2b54e9ee4d5b043ea866763cf2e85e.tar.gz |
Make meta_* logging utilities not require line break
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
50 files changed, 596 insertions, 579 deletions
diff --git a/src/backends/meta-idle-monitor-dbus.c b/src/backends/meta-idle-monitor-dbus.c index 3fa0018bd..7c9065b6c 100644 --- a/src/backends/meta-idle-monitor-dbus.c +++ b/src/backends/meta-idle-monitor-dbus.c @@ -235,7 +235,7 @@ on_name_acquired (GDBusConnection *connection, const char *name, gpointer user_data) { - meta_verbose ("Acquired name %s\n", name); + meta_verbose ("Acquired name %s", name); } static void @@ -243,7 +243,7 @@ on_name_lost (GDBusConnection *connection, const char *name, gpointer user_data) { - meta_verbose ("Lost or failed to acquire name %s\n", name); + meta_verbose ("Lost or failed to acquire name %s", name); } void diff --git a/src/backends/meta-monitor-manager-dummy.c b/src/backends/meta-monitor-manager-dummy.c index 2516d51ae..d817d0dc1 100644 --- a/src/backends/meta-monitor-manager-dummy.c +++ b/src/backends/meta-monitor-manager-dummy.c @@ -445,7 +445,7 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager) scales_str_list = g_strsplit (monitor_scales_str, ",", -1); if (g_strv_length (scales_str_list) != num_monitors) meta_warning ("Number of specified monitor scales differ from number " - "of monitors (defaults to 1).\n"); + "of monitors (defaults to 1)."); for (i = 0; i < num_monitors && scales_str_list[i]; i++) { float scale = g_ascii_strtod (scales_str_list[i], NULL); diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index 1beb658bd..1c6d37c30 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -2399,7 +2399,7 @@ on_name_acquired (GDBusConnection *connection, const char *name, gpointer user_data) { - meta_topic (META_DEBUG_DBUS, "Acquired name %s\n", name); + meta_topic (META_DEBUG_DBUS, "Acquired name %s", name); } static void @@ -2407,7 +2407,7 @@ on_name_lost (GDBusConnection *connection, const char *name, gpointer user_data) { - meta_topic (META_DEBUG_DBUS, "Lost or failed to acquire name %s\n", name); + meta_topic (META_DEBUG_DBUS, "Lost or failed to acquire name %s", name); } static void diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c index 02bb2aaf0..3c6688df4 100644 --- a/src/backends/native/meta-cursor-renderer-native.c +++ b/src/backends/native/meta-cursor-renderer-native.c @@ -1196,7 +1196,7 @@ load_cursor_sprite_gbm_buffer_for_gpu (MetaCursorRendererNative *native, if (width > cursor_width || height > cursor_height) { - meta_warning ("Invalid theme cursor size (must be at most %ux%u)\n", + meta_warning ("Invalid theme cursor size (must be at most %ux%u)", (unsigned int)cursor_width, (unsigned int)cursor_height); return; } @@ -1213,7 +1213,7 @@ load_cursor_sprite_gbm_buffer_for_gpu (MetaCursorRendererNative *native, gbm_format, GBM_BO_USE_CURSOR | GBM_BO_USE_WRITE); if (!bo) { - meta_warning ("Failed to allocate HW cursor buffer\n"); + meta_warning ("Failed to allocate HW cursor buffer"); return; } @@ -1232,7 +1232,7 @@ load_cursor_sprite_gbm_buffer_for_gpu (MetaCursorRendererNative *native, } else { - meta_warning ("HW cursor for format %d not supported\n", gbm_format); + meta_warning ("HW cursor for format %d not supported", gbm_format); } } @@ -1521,7 +1521,7 @@ realize_cursor_sprite_from_wl_buffer_for_gpu (MetaCursorRenderer *renderer, if (width != cursor_width || height != cursor_height) { - meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors\n"); + meta_warning ("Invalid cursor size (must be 64x64), falling back to software (GL) cursors"); return; } @@ -1532,7 +1532,7 @@ realize_cursor_sprite_from_wl_buffer_for_gpu (MetaCursorRenderer *renderer, GBM_BO_USE_CURSOR); if (!bo) { - meta_warning ("Importing HW cursor from wl_buffer failed\n"); + meta_warning ("Importing HW cursor from wl_buffer failed"); return; } diff --git a/src/backends/native/meta-seat-native.c b/src/backends/native/meta-seat-native.c index 8310cb078..c53082608 100644 --- a/src/backends/native/meta-seat-native.c +++ b/src/backends/native/meta-seat-native.c @@ -277,7 +277,7 @@ update_button_count (MetaSeatNative *seat, if (seat->button_count[button] == 0) { meta_topic (META_DEBUG_INPUT, - "Counting release of key 0x%x and count is already 0\n", + "Counting release of key 0x%x and count is already 0", button); return 0; } @@ -306,7 +306,7 @@ meta_seat_native_notify_key (MetaSeatNative *seat, (!state && count != 0)) { meta_topic (META_DEBUG_INPUT, - "Dropping repeated %s of key 0x%x, count %d, state %d\n", + "Dropping repeated %s of key 0x%x, count %d, state %d", state ? "press" : "release", key, count, state); return; } @@ -530,7 +530,7 @@ meta_seat_native_notify_button (MetaSeatNative *seat, (!state && button_count != 0)) { meta_topic (META_DEBUG_INPUT, - "Dropping repeated %s of button 0x%x, count %d\n", + "Dropping repeated %s of button 0x%x, count %d", state ? "press" : "release", button, button_count); return; } @@ -1823,7 +1823,7 @@ process_device_event (MetaSeatNative *seat, { meta_topic (META_DEBUG_INPUT, "Dropping key-%s of key 0x%x because seat-wide " - "key count is %d\n", + "key count is %d", key_state == LIBINPUT_KEY_STATE_PRESSED ? "press" : "release", key, seat_key_count); break; @@ -1917,7 +1917,7 @@ process_device_event (MetaSeatNative *seat, { meta_topic (META_DEBUG_INPUT, "Dropping button-%s of button 0x%x because seat-wide " - "button count is %d\n", + "button count is %d", button_state == LIBINPUT_BUTTON_STATE_PRESSED ? "press" : "release", button, seat_button_count); break; diff --git a/src/backends/native/meta-virtual-input-device-native.c b/src/backends/native/meta-virtual-input-device-native.c index 9326fc083..ea0882ca1 100644 --- a/src/backends/native/meta-virtual-input-device-native.c +++ b/src/backends/native/meta-virtual-input-device-native.c @@ -119,7 +119,7 @@ release_pressed_buttons (ClutterVirtualInputDevice *virtual_device) meta_topic (META_DEBUG_INPUT, "Releasing pressed buttons while destroying virtual input device " - "(device %p)\n", virtual_device); + "(device %p)", virtual_device); for (code = 0; code < G_N_ELEMENTS (virtual_evdev->button_count); code++) { @@ -248,7 +248,7 @@ meta_virtual_input_device_native_notify_button (ClutterVirtualInputDevice *virtu } meta_topic (META_DEBUG_INPUT, - "Emitting virtual button-%s of button 0x%x (device %p)\n", + "Emitting virtual button-%s of button 0x%x (device %p)", button_state == CLUTTER_BUTTON_STATE_PRESSED ? "press" : "release", evdev_button, virtual_device); @@ -290,7 +290,7 @@ meta_virtual_input_device_native_notify_key (ClutterVirtualInputDevice *virtual_ } meta_topic (META_DEBUG_INPUT, - "Emitting virtual key-%s of key 0x%x (device %p)\n", + "Emitting virtual key-%s of key 0x%x (device %p)", key_state == CLUTTER_KEY_STATE_PRESSED ? "press" : "release", key, virtual_device); @@ -385,7 +385,7 @@ apply_level_modifiers (ClutterVirtualInputDevice *virtual_device, keycode, &evcode); meta_topic (META_DEBUG_INPUT, - "Emitting virtual key-%s of modifier key 0x%x (device %p)\n", + "Emitting virtual key-%s of modifier key 0x%x (device %p)", key_state == CLUTTER_KEY_STATE_PRESSED ? "press" : "release", evcode, virtual_device); @@ -440,7 +440,7 @@ meta_virtual_input_device_native_notify_keyval (ClutterVirtualInputDevice *virtu meta_topic (META_DEBUG_INPUT, "Emitting virtual key-%s of key 0x%x with modifier level %d, " - "press count %d (device %p)\n", + "press count %d (device %p)", key_state == CLUTTER_KEY_STATE_PRESSED ? "press" : "release", evcode, level, key_count, virtual_device); @@ -690,7 +690,7 @@ meta_virtual_input_device_native_constructed (GObject *object) device_type = clutter_virtual_input_device_get_device_type (virtual_device); meta_topic (META_DEBUG_INPUT, - "Creating new virtual input device of type %d (%p)\n", + "Creating new virtual input device of type %d (%p)", device_type, virtual_device); virtual_evdev->device = diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c index cf4c9362e..36349ffbb 100644 --- a/src/backends/x11/meta-backend-x11.c +++ b/src/backends/x11/meta-backend-x11.c @@ -556,7 +556,7 @@ meta_backend_x11_post_init (MetaBackend *backend) } if (!has_xi) - meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n"); + meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer"); if (!xkb_x11_setup_xkb_extension (priv->xcb, XKB_X11_MIN_MAJOR_XKB_VERSION, @@ -565,7 +565,7 @@ meta_backend_x11_post_init (MetaBackend *backend) NULL, NULL, &priv->xkb_event_base, &priv->xkb_error_base)) - meta_fatal ("X server doesn't have the XKB extension, version %d.%d or newer\n", + meta_fatal ("X server doesn't have the XKB extension, version %d.%d or newer", XKB_X11_MIN_MAJOR_XKB_VERSION, XKB_X11_MIN_MINOR_XKB_VERSION); META_BACKEND_CLASS (meta_backend_x11_parent_class)->post_init (backend); diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c index 946a22123..da0e7d68c 100644 --- a/src/backends/x11/meta-monitor-manager-xrandr.c +++ b/src/backends/x11/meta-monitor-manager-xrandr.c @@ -525,7 +525,7 @@ apply_crtc_assignments (MetaMonitorManager *manager, const MetaCrtcModeInfo *crtc_mode_info = meta_crtc_mode_get_info (crtc_mode); - meta_warning ("Configuring CRTC %d with mode %d (%d x %d @ %f) at position %d, %d and transform %u failed\n", + meta_warning ("Configuring CRTC %d with mode %d (%d x %d @ %f) at position %d, %d and transform %u failed", (unsigned) meta_crtc_get_id (crtc), (unsigned) mode, crtc_mode_info->width, crtc_mode_info->height, diff --git a/src/backends/x11/meta-output-xrandr.c b/src/backends/x11/meta-output-xrandr.c index 3a85cb7aa..e17215ff4 100644 --- a/src/backends/x11/meta-output-xrandr.c +++ b/src/backends/x11/meta-output-xrandr.c @@ -405,7 +405,7 @@ output_info_init_backlight_limits_xrandr (MetaOutputInfo *output_info, if (!reply->range || reply->length != 2) { - meta_verbose ("backlight %s was not range\n", output_info->name); + meta_verbose ("backlight %s was not range", output_info->name); return; } diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index e5fc844a4..6583b2ade 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -960,7 +960,7 @@ meta_compositor_sync_stack (MetaCompositor *compositor, if (!stack_actor) { meta_verbose ("Failed to find corresponding MetaWindowActor " - "for window %s\n", meta_window_get_description (stack_window)); + "for window %s", meta_window_get_description (stack_window)); stack = g_list_delete_link (stack, stack); } else diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c index 04b66a068..71eca7a95 100644 --- a/src/compositor/meta-background.c +++ b/src/compositor/meta-background.c @@ -611,7 +611,7 @@ ensure_color_texture (MetaBackground *self) if (error != NULL) { - meta_warning ("Failed to allocate color texture: %s\n", error->message); + meta_warning ("Failed to allocate color texture: %s", error->message); g_error_free (error); } } diff --git a/src/compositor/meta-shadow-factory.c b/src/compositor/meta-shadow-factory.c index d6bee655b..11a2b3553 100644 --- a/src/compositor/meta-shadow-factory.c +++ b/src/compositor/meta-shadow-factory.c @@ -814,7 +814,7 @@ make_shadow (MetaShadow *shadow, if (error) { - meta_warning ("Failed to allocate shadow texture: %s\n", error->message); + meta_warning ("Failed to allocate shadow texture: %s", error->message); g_error_free (error); } diff --git a/src/compositor/meta-surface-actor-x11.c b/src/compositor/meta-surface-actor-x11.c index d46e5ad49..3e1a5a723 100644 --- a/src/compositor/meta-surface-actor-x11.c +++ b/src/compositor/meta-surface-actor-x11.c @@ -172,7 +172,7 @@ update_pixmap (MetaSurfaceActorX11 *self) if (new_pixmap == None) { - meta_verbose ("Unable to get named pixmap for %s\n", + meta_verbose ("Unable to get named pixmap for %s", meta_window_get_description (self->window)); return; } diff --git a/src/compositor/meta-sync-ring.c b/src/compositor/meta-sync-ring.c index 944b4a886..917bf1235 100644 --- a/src/compositor/meta-sync-ring.c +++ b/src/compositor/meta-sync-ring.c @@ -138,7 +138,7 @@ load_gl_symbol (const char *name, *func = cogl_get_proc_address (name); if (!*func) { - meta_verbose ("MetaSyncRing: failed to resolve required GL symbol \"%s\"\n", name); + meta_verbose ("MetaSyncRing: failed to resolve required GL symbol \"%s\"", name); return FALSE; } return TRUE; @@ -215,7 +215,7 @@ load_required_symbols (void) if (!check_gl_extensions ()) { - meta_verbose ("MetaSyncRing: couldn't find required GL extensions\n"); + meta_verbose ("MetaSyncRing: couldn't find required GL extensions"); goto out; } @@ -497,7 +497,7 @@ meta_sync_ring_reboot (Display *xdisplay) if (!meta_sync_ring_get ()) { - meta_warning ("MetaSyncRing: Too many reboots -- disabling\n"); + meta_warning ("MetaSyncRing: Too many reboots -- disabling"); return FALSE; } @@ -522,13 +522,13 @@ meta_sync_ring_after_frame (void) GLenum status = meta_sync_check_update_finished (sync_to_reset, 0); if (status == GL_TIMEOUT_EXPIRED) { - meta_warning ("MetaSyncRing: We should never wait for a sync -- add more syncs?\n"); + meta_warning ("MetaSyncRing: We should never wait for a sync -- add more syncs?"); status = meta_sync_check_update_finished (sync_to_reset, MAX_SYNC_WAIT_TIME); } if (status != GL_ALREADY_SIGNALED && status != GL_CONDITION_SATISFIED) { - meta_warning ("MetaSyncRing: Timed out waiting for sync object.\n"); + meta_warning ("MetaSyncRing: Timed out waiting for sync object."); return meta_sync_ring_reboot (ring->xdisplay); } @@ -559,7 +559,7 @@ meta_sync_ring_insert_wait (void) if (ring->current_sync->state != META_SYNC_STATE_READY) { - meta_warning ("MetaSyncRing: Sync object is not ready -- were events handled properly?\n"); + meta_warning ("MetaSyncRing: Sync object is not ready -- were events handled properly?"); if (!meta_sync_ring_reboot (ring->xdisplay)) return FALSE; } diff --git a/src/core/constraints.c b/src/core/constraints.c index 168a55b8a..9f4f9120d 100644 --- a/src/core/constraints.c +++ b/src/core/constraints.c @@ -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 diff --git a/src/core/delete.c b/src/core/delete.c index 2727711f9..058764b08 100644 --- a/src/core/delete.c +++ b/src/core/delete.c @@ -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)); } diff --git a/src/core/display.c b/src/core/display.c index 521e5d093..2fc32da71 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -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); diff --git a/src/core/edge-resistance.c b/src/core/edge-resistance.c index cf23e2604..0baed077e 100644 --- a/src/core/edge-resistance.c +++ b/src/core/edge-resistance.c @@ -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); } diff --git a/src/core/events.c b/src/core/events.c index 438beda5c..68c72da11 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -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 { diff --git a/src/core/frame.c b/src/core/frame.c index b58ad1173..9c8cbb946 100644 --- a/src/core/frame.c +++ b/src/core/frame.c @@ -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, diff --git a/src/core/keybindings.c b/src/core/keybindings.c index cbf78d0b5..5ccacb863 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -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); } diff --git a/src/core/main.c b/src/core/main.c index 5a20cd6a7..089114151 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -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); } diff --git a/src/core/meta-close-dialog-default.c b/src/core/meta-close-dialog-default.c index 5ea32e205..544a5b62d 100644 --- a/src/core/meta-close-dialog-default.c +++ b/src/core/meta-close-dialog-default.c @@ -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 diff --git a/src/core/meta-workspace-manager.c b/src/core/meta-workspace-manager.c index f0ec1f09c..2e2262702 100644 --- a/src/core/meta-workspace-manager.c +++ b/src/core/meta-workspace-manager.c @@ -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; } diff --git a/src/core/place.c b/src/core/place.c index b9dd3db9e..1075fe20d 100644 --- a/src/core/place.c +++ b/src/core/place.c @@ -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; diff --git a/src/core/prefs.c b/src/core/prefs.c index 3dc194aa7..a12b66671 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -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; } diff --git a/src/core/restart.c b/src/core/restart.c index b13e1dcf4..10a6bd0c9 100644 --- a/src/core/restart.c +++ b/src/core/restart.c @@ -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; } diff --git a/src/core/stack-tracker.c b/src/core/stack-tracker.c index 96ffabcee..a1f8e709d 100644 --- a/src/core/stack-tracker.c +++ b/src/core/stack-tracker.c @@ -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 diff --git a/src/core/stack.c b/src/core/stack.c index 56e810ff2..116a7312b 100644 --- a/src/core/stack.c +++ b/src/core/stack.c @@ -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); } diff --git a/src/core/startup-notification.c b/src/core/startup-notification.c index 99c0d9d06..07f1856b0 100644 --- a/src/core/startup-notification.c +++ b/src/core/startup-notification.c @@ -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); diff --git a/src/core/util.c b/src/core/util.c index b6f31b186..681529b16 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -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); } diff --git a/src/core/window.c b/src/core/window.c index dd1cd625e..dd4882081 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -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 ()) { diff --git a/src/core/workspace.c b/src/core/workspace.c index 64a0d259c..1dd8daf22 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -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); } } diff --git a/src/ui/frames.c b/src/ui/frames.c index 5cbfb09e9..542cc54e0 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -990,7 +990,7 @@ get_action (const ClutterEvent *event) case CLUTTER_BUTTON_MIDDLE: return META_ACTION_MIDDLE_CLICK; default: - meta_verbose ("No action triggered for button %u %s\n", + meta_verbose ("No action triggered for button %u %s", event->button.button, (event->type == CLUTTER_BUTTON_PRESS) ? "press" : "release"); } @@ -1146,7 +1146,7 @@ handle_press_event (MetaUIFrame *frame, control == META_FRAME_CONTROL_MAXIMIZE)) { meta_topic (META_DEBUG_FOCUS, - "Focusing window with frame 0x%lx due to button 1 press\n", + "Focusing window with frame 0x%lx due to button 1 press", frame->xwindow); meta_window_focus (frame->meta_window, evtime); } @@ -1246,7 +1246,7 @@ meta_ui_frame_update_prelit_control (MetaUIFrame *frame, MetaFrameControl old_control; MetaCursor cursor; - meta_verbose ("Updating prelit control from %u to %u\n", + meta_verbose ("Updating prelit control from %u to %u", frame->prelit_control, control); cursor = META_CURSOR_DEFAULT; diff --git a/src/ui/theme.c b/src/ui/theme.c index 095b0f420..a4c8a0de2 100644 --- a/src/ui/theme.c +++ b/src/ui/theme.c @@ -516,7 +516,7 @@ meta_frame_layout_calc_geometry (MetaFrameLayout *layout, continue; else { - meta_bug ("Could not find a button to strip. n_left = %d n_right = %d\n", + meta_bug ("Could not find a button to strip. n_left = %d n_right = %d", n_left, n_right); } } diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c index 0824007ad..29bd2cbf6 100644 --- a/src/wayland/meta-wayland-keyboard.c +++ b/src/wayland/meta-wayland-keyboard.c @@ -622,16 +622,16 @@ meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard, !(event->flags & CLUTTER_EVENT_FLAG_INPUT_METHOD)) return FALSE; - meta_verbose ("Handling key %s event code %d\n", + meta_verbose ("Handling key %s event code %d", is_press ? "press" : "release", event->hardware_keycode); handled = notify_key (keyboard, (const ClutterEvent *) event); if (handled) - meta_verbose ("Sent event to wayland client\n"); + meta_verbose ("Sent event to wayland client"); else - meta_verbose ("No wayland surface is focused, continuing normal operation\n"); + meta_verbose ("No wayland surface is focused, continuing normal operation"); if (keyboard->mods_changed != 0) { diff --git a/src/wayland/meta-wayland-outputs.c b/src/wayland/meta-wayland-outputs.c index 75c29ab00..9a1b833fb 100644 --- a/src/wayland/meta-wayland-outputs.c +++ b/src/wayland/meta-wayland-outputs.c @@ -329,7 +329,7 @@ bind_output (struct wl_client *client, #ifdef WITH_VERBOSE_MODE monitor = pick_main_monitor (logical_monitor); - meta_verbose ("Binding monitor %p/%s (%u, %u, %u, %u) x %f\n", + meta_verbose ("Binding monitor %p/%s (%u, %u, %u, %u) x %f", logical_monitor, meta_monitor_get_product (monitor), logical_monitor->rect.x, logical_monitor->rect.y, diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c index c0d3197af..8d346cbd7 100644 --- a/src/wayland/meta-wayland.c +++ b/src/wayland/meta-wayland.c @@ -325,7 +325,10 @@ set_gnome_env (const char *name, remote_error = g_dbus_error_get_remote_error (error); if (g_strcmp0 (remote_error, "org.gnome.SessionManager.NotInInitialization") != 0) - meta_warning ("Failed to set environment variable %s for gnome-session: %s\n", name, error->message); + { + meta_warning ("Failed to set environment variable %s for gnome-session: %s", + name, error->message); + } g_free (remote_error); g_error_free (error); diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c index 9a33f73e0..d824e45c7 100644 --- a/src/wayland/meta-window-wayland.c +++ b/src/wayland/meta-window-wayland.c @@ -1070,7 +1070,7 @@ meta_window_wayland_set_min_size (MetaWindow *window, gint64 new_width, new_height; float scale; - meta_topic (META_DEBUG_GEOMETRY, "Window %s sets min size %d x %d\n", + meta_topic (META_DEBUG_GEOMETRY, "Window %s sets min size %d x %d", window->desc, width, height); if (width == 0 && height == 0) @@ -1104,7 +1104,7 @@ meta_window_wayland_set_max_size (MetaWindow *window, gint64 new_width, new_height; float scale; - meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max size %d x %d\n", + meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max size %d x %d", window->desc, width, height); if (width == 0 && height == 0) diff --git a/src/x11/events.c b/src/x11/events.c index 8c78b2ff1..ccd56afed 100644 --- a/src/x11/events.c +++ b/src/x11/events.c @@ -728,7 +728,7 @@ handle_window_focus_event (MetaX11Display *x11_display, meta_topic (META_DEBUG_FOCUS, "Focus %s event received on %s 0x%lx (%s) " - "mode %s detail %s serial %lu\n", + "mode %s detail %s serial %lu", event->evtype == XI_FocusIn ? "in" : event->evtype == XI_FocusOut ? "out" : "???", @@ -773,7 +773,7 @@ handle_window_focus_event (MetaX11Display *x11_display, event->detail > XINotifyNonlinearVirtual) { meta_topic (META_DEBUG_FOCUS, - "Ignoring focus event generated by a grab or other weirdness\n"); + "Ignoring focus event generated by a grab or other weirdness"); return FALSE; } @@ -789,7 +789,7 @@ handle_window_focus_event (MetaX11Display *x11_display, { /* This event means the client moved focus to a subwindow */ meta_topic (META_DEBUG_FOCUS, - "Ignoring focus out with NotifyInferior\n"); + "Ignoring focus out with NotifyInferior"); return FALSE; } @@ -916,7 +916,7 @@ handle_input_xevent (MetaX11Display *x11_display, meta_topic (META_DEBUG_FOCUS, "Focus got set to None, probably due to " "brain-damage in the X protocol (see bug " - "125492). Setting the default focus window.\n"); + "125492). Setting the default focus window."); meta_workspace_focus_default_window (workspace_manager->active_workspace, NULL, meta_x11_display_get_current_time_roundtrip (x11_display)); @@ -928,7 +928,7 @@ handle_input_xevent (MetaX11Display *x11_display, meta_topic (META_DEBUG_FOCUS, "Focus got set to root window, probably due to " "gnome-session logout dialog usage (see bug " - "153220). Setting the default focus window.\n"); + "153220). Setting the default focus window."); meta_workspace_focus_default_window (workspace_manager->active_workspace, NULL, meta_x11_display_get_current_time_roundtrip (x11_display)); @@ -956,7 +956,7 @@ process_request_frame_extents (MetaX11Display *x11_display, MotifWmHints *hints = NULL; gboolean hints_set = FALSE; - meta_verbose ("Setting frame extents for 0x%lx\n", xwindow); + meta_verbose ("Setting frame extents for 0x%lx", xwindow); /* See if the window is decorated. */ hints_set = meta_prop_get_motif_hints (x11_display, @@ -980,7 +980,7 @@ process_request_frame_extents (MetaX11Display *x11_display, meta_topic (META_DEBUG_GEOMETRY, "Setting _NET_FRAME_EXTENTS on unmanaged window 0x%lx " - "to top = %lu, left = %lu, bottom = %lu, right = %lu\n", + "to top = %lu, left = %lu, bottom = %lu, right = %lu", xwindow, data[0], data[1], data[2], data[3]); meta_x11_error_trap_push (x11_display); @@ -1035,7 +1035,7 @@ convert_property (MetaX11Display *x11_display, * can send SelectionNotify */ /* FIXME the error trap pop synced anyway, right? */ - meta_topic (META_DEBUG_SYNC, "Syncing on %s\n", G_STRFUNC); + meta_topic (META_DEBUG_SYNC, "Syncing on %s", G_STRFUNC); XSync (x11_display->xdisplay, False); return TRUE; @@ -1058,7 +1058,7 @@ process_selection_request (MetaX11Display *x11_display, event->xselectionrequest.selection); meta_x11_error_trap_pop (x11_display); - meta_verbose ("Selection request with selection %s window 0x%lx not a WM_Sn selection we recognize\n", + meta_verbose ("Selection request with selection %s window 0x%lx not a WM_Sn selection we recognize", str ? str : "(bad atom)", event->xselectionrequest.owner); meta_XFree (str); @@ -1138,7 +1138,7 @@ process_selection_request (MetaX11Display *x11_display, event->xselectionrequest.requestor, False, 0L, (XEvent*)&reply); - meta_verbose ("Handled selection request\n"); + meta_verbose ("Handled selection request"); } static gboolean @@ -1167,7 +1167,7 @@ process_selection_clear (MetaX11Display *x11_display, event->xselectionclear.selection); meta_x11_error_trap_pop (x11_display); - meta_verbose ("Selection clear with selection %s window 0x%lx not a WM_Sn selection we recognize\n", + meta_verbose ("Selection clear with selection %s window 0x%lx not a WM_Sn selection we recognize", str ? str : "(bad atom)", event->xselectionclear.window); meta_XFree (str); @@ -1175,7 +1175,7 @@ process_selection_clear (MetaX11Display *x11_display, return FALSE; } - meta_verbose ("Got selection clear for on display %s\n", + meta_verbose ("Got selection clear for on display %s", x11_display->name); /* We can't close a GdkDisplay in an even handler. */ @@ -1284,7 +1284,7 @@ handle_other_xevent (MetaX11Display *x11_display, else { meta_topic (META_DEBUG_SHAPES, - "ShapeNotify not on a client window (window %s frame_was_receiver = %d)\n", + "ShapeNotify not on a client window (window %s frame_was_receiver = %d)", window ? window->desc : "(none)", frame_was_receiver); } @@ -1333,7 +1333,7 @@ handle_other_xevent (MetaX11Display *x11_display, if (frame_was_receiver) { - meta_warning ("Unexpected destruction of frame 0x%lx, not sure if this should silently fail or be considered a bug\n", + meta_warning ("Unexpected destruction of frame 0x%lx, not sure if this should silently fail or be considered a bug", window->frame->xwindow); meta_x11_error_trap_push (x11_display); meta_window_destroy_frame (window->frame->window); @@ -1367,7 +1367,7 @@ handle_other_xevent (MetaX11Display *x11_display, if (window->unmaps_pending == 0) { meta_topic (META_DEBUG_WINDOW_STATE, - "Window %s withdrawn\n", + "Window %s withdrawn", window->desc); /* Unmanage withdrawn window */ @@ -1379,7 +1379,7 @@ handle_other_xevent (MetaX11Display *x11_display, { window->unmaps_pending -= 1; meta_topic (META_DEBUG_WINDOW_STATE, - "Received pending unmap, %d now pending\n", + "Received pending unmap, %d now pending", window->unmaps_pending); } } @@ -1414,7 +1414,7 @@ handle_other_xevent (MetaX11Display *x11_display, } else if (frame_was_receiver) { - meta_warning ("Map requests on the frame window are unexpected\n"); + meta_warning ("Map requests on the frame window are unexpected"); break; } @@ -1422,7 +1422,7 @@ handle_other_xevent (MetaX11Display *x11_display, if (window == NULL) break; - meta_verbose ("MapRequest on %s mapped = %d minimized = %d\n", + meta_verbose ("MapRequest on %s mapped = %d minimized = %d", window->desc, window->mapped, window->minimized); if (window->minimized) @@ -1430,7 +1430,7 @@ handle_other_xevent (MetaX11Display *x11_display, meta_window_unminimize (window); if (window->workspace != workspace_manager->active_workspace) { - meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d\n", + meta_verbose ("Changing workspace due to MapRequest mapped = %d minimized = %d", window->mapped, window->minimized); meta_window_change_workspace (window, workspace_manager->active_workspace); @@ -1481,7 +1481,7 @@ handle_other_xevent (MetaX11Display *x11_display, xwc.height = event->xconfigurerequest.height; xwc.border_width = event->xconfigurerequest.border_width; - meta_verbose ("Configuring withdrawn window to %d,%d %dx%d border %d (some values may not be in mask)\n", + meta_verbose ("Configuring withdrawn window to %d,%d %dx%d border %d (some values may not be in mask)", xwc.x, xwc.y, xwc.width, xwc.height, xwc.border_width); meta_x11_error_trap_push (x11_display); XConfigureWindow (x11_display->xdisplay, event->xconfigurerequest.window, @@ -1581,7 +1581,7 @@ handle_other_xevent (MetaX11Display *x11_display, time = event->xclient.data.l[1]; meta_verbose ("Request to change current workspace to %d with " - "specified timestamp of %u\n", + "specified timestamp of %u", space, time); workspace = meta_workspace_manager_get_workspace_by_index (workspace_manager, space); @@ -1596,7 +1596,7 @@ handle_other_xevent (MetaX11Display *x11_display, } else { - meta_verbose ("Don't know about workspace %d\n", space); + meta_verbose ("Don't know about workspace %d", space); } } else if (event->xclient.message_type == @@ -1606,7 +1606,7 @@ handle_other_xevent (MetaX11Display *x11_display, num_spaces = event->xclient.data.l[0]; - meta_verbose ("Request to set number of workspaces to %d\n", + meta_verbose ("Request to set number of workspaces to %d", num_spaces); meta_prefs_set_num_workspaces (num_spaces); @@ -1620,7 +1620,7 @@ handle_other_xevent (MetaX11Display *x11_display, showing_desktop = event->xclient.data.l[0] != 0; /* FIXME: Braindead protocol doesn't have a timestamp */ timestamp = meta_x11_display_get_current_time_roundtrip (x11_display); - meta_verbose ("Request to %s desktop\n", + meta_verbose ("Request to %s desktop", showing_desktop ? "show" : "hide"); if (showing_desktop) @@ -1634,7 +1634,7 @@ handle_other_xevent (MetaX11Display *x11_display, else if (event->xclient.message_type == x11_display->atom_WM_PROTOCOLS) { - meta_verbose ("Received WM_PROTOCOLS message\n"); + meta_verbose ("Received WM_PROTOCOLS message"); if ((Atom)event->xclient.data.l[0] == x11_display->atom__NET_WM_PING) { @@ -1654,7 +1654,7 @@ handle_other_xevent (MetaX11Display *x11_display, if (event->xclient.message_type == x11_display->atom__NET_REQUEST_FRAME_EXTENTS) { - meta_verbose ("Received _NET_REQUEST_FRAME_EXTENTS message\n"); + meta_verbose ("Received _NET_REQUEST_FRAME_EXTENTS message"); process_request_frame_extents (x11_display, event); } } @@ -1816,7 +1816,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display, display->focus_window && !window_has_xwindow (display->focus_window, x11_display->server_focus_window)) { - meta_topic (META_DEBUG_FOCUS, "Earlier attempt to focus %s failed\n", + meta_topic (META_DEBUG_FOCUS, "Earlier attempt to focus %s failed", display->focus_window->desc); meta_x11_display_update_focus_window (x11_display, x11_display->server_focus_window, @@ -1854,7 +1854,7 @@ meta_x11_display_handle_xevent (MetaX11Display *x11_display, { meta_display_add_ignored_crossing_serial (display, event->xany.serial); meta_topic (META_DEBUG_FOCUS, - "Adding EnterNotify serial %lu to ignored focus serials\n", + "Adding EnterNotify serial %lu to ignored focus serials", event->xany.serial); } } diff --git a/src/x11/group-props.c b/src/x11/group-props.c index a906696c3..77ff1df73 100644 --- a/src/x11/group-props.c +++ b/src/x11/group-props.c @@ -140,7 +140,7 @@ reload_wm_client_machine (MetaGroup *group, if (value->type != META_PROP_VALUE_INVALID) group->wm_client_machine = g_strdup (value->v.str); - meta_verbose ("Group has client machine \"%s\"\n", + meta_verbose ("Group has client machine \"%s\"", group->wm_client_machine ? group->wm_client_machine : "unset"); } @@ -163,7 +163,7 @@ reload_net_startup_id (MetaGroup *group, if (value->type != META_PROP_VALUE_INVALID) group->startup_id = g_strdup (value->v.str); - meta_verbose ("Group has startup id \"%s\"\n", + meta_verbose ("Group has startup id \"%s\"", group->startup_id ? group->startup_id : "unset"); } diff --git a/src/x11/group.c b/src/x11/group.c index 60f2d2902..57b79e96e 100644 --- a/src/x11/group.c +++ b/src/x11/group.c @@ -88,7 +88,7 @@ meta_group_new (MetaX11Display *x11_display, meta_group_reload_properties (group, initial_props, N_INITIAL_PROPS); meta_topic (META_DEBUG_GROUPS, - "Created new group with leader 0x%lx\n", + "Created new group with leader 0x%lx", group->group_leader); return g_steal_pointer (&group); @@ -103,7 +103,7 @@ meta_group_unref (MetaGroup *group) if (group->refcount == 0) { meta_topic (META_DEBUG_GROUPS, - "Destroying group with leader 0x%lx\n", + "Destroying group with leader 0x%lx", group->group_leader); g_assert (group->x11_display->groups_by_leader != NULL); @@ -193,7 +193,7 @@ meta_window_compute_group (MetaWindow* window) window->group->windows = g_slist_prepend (window->group->windows, window); meta_topic (META_DEBUG_GROUPS, - "Adding %s to group with leader 0x%lx\n", + "Adding %s to group with leader 0x%lx", window->desc, group->group_leader); } @@ -203,7 +203,7 @@ remove_window_from_group (MetaWindow *window) if (window->group != NULL) { meta_topic (META_DEBUG_GROUPS, - "Removing %s from group with leader 0x%lx\n", + "Removing %s from group with leader 0x%lx", window->desc, window->group->group_leader); window->group->windows = diff --git a/src/x11/meta-startup-notification-x11.c b/src/x11/meta-startup-notification-x11.c index da80f5e14..70aa2ac0f 100644 --- a/src/x11/meta-startup-notification-x11.c +++ b/src/x11/meta-startup-notification-x11.c @@ -208,7 +208,7 @@ meta_startup_notification_sn_event (SnMonitorEvent *event, wmclass = sn_startup_sequence_get_wmclass (sequence); meta_topic (META_DEBUG_STARTUP, - "Received startup initiated for %s wmclass %s\n", + "Received startup initiated for %s wmclass %s", sn_startup_sequence_get_id (sequence), wmclass ? wmclass : "(unset)"); @@ -221,7 +221,7 @@ meta_startup_notification_sn_event (SnMonitorEvent *event, case SN_MONITOR_EVENT_COMPLETED: { meta_topic (META_DEBUG_STARTUP, - "Received startup completed for %s\n", + "Received startup completed for %s", sn_startup_sequence_get_id (sequence)); seq = meta_startup_notification_lookup_sequence (sn, sn_startup_sequence_get_id (sequence)); @@ -235,13 +235,13 @@ meta_startup_notification_sn_event (SnMonitorEvent *event, case SN_MONITOR_EVENT_CHANGED: meta_topic (META_DEBUG_STARTUP, - "Received startup changed for %s\n", + "Received startup changed for %s", sn_startup_sequence_get_id (sequence)); break; case SN_MONITOR_EVENT_CANCELED: meta_topic (META_DEBUG_STARTUP, - "Received startup canceled for %s\n", + "Received startup canceled for %s", sn_startup_sequence_get_id (sequence)); break; } diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c index 525d0cab6..ce62a6a17 100644 --- a/src/x11/meta-x11-display.c +++ b/src/x11/meta-x11-display.c @@ -225,7 +225,7 @@ meta_x11_display_dispose (GObject *object) meta_x11_error_trap_push (x11_display); XSelectInput (x11_display->xdisplay, x11_display->xroot, 0); if (meta_x11_error_trap_pop_with_return (x11_display) != Success) - meta_warning ("Could not release screen %d on display \"%s\"\n", + meta_warning ("Could not release screen %d on display \"%s\"", DefaultScreen (x11_display->xdisplay), x11_display->name); @@ -301,7 +301,7 @@ query_xsync_extension (MetaX11Display *x11_display) XSyncSetPriority (x11_display->xdisplay, None, 10); } - meta_verbose ("Attempted to init Xsync, found version %d.%d error base %d event base %d\n", + meta_verbose ("Attempted to init Xsync, found version %d.%d error base %d event base %d", major, minor, x11_display->xsync_error_base, x11_display->xsync_event_base); @@ -325,7 +325,7 @@ query_xshape_extension (MetaX11Display *x11_display) else x11_display->have_shape = TRUE; - meta_verbose ("Attempted to init Shape, found error base %d event base %d\n", + meta_verbose ("Attempted to init Shape, found error base %d event base %d", x11_display->shape_error_base, x11_display->shape_event_base); } @@ -363,7 +363,7 @@ query_xcomposite_extension (MetaX11Display *x11_display) } meta_verbose ("Attempted to init Composite, found error base %d event base %d " - "extn ver %d %d\n", + "extn ver %d %d", x11_display->composite_error_base, x11_display->composite_event_base, x11_display->composite_major_version, @@ -388,7 +388,7 @@ query_xdamage_extension (MetaX11Display *x11_display) else x11_display->have_damage = TRUE; - meta_verbose ("Attempted to init Damage, found error base %d event base %d\n", + meta_verbose ("Attempted to init Damage, found error base %d event base %d", x11_display->damage_error_base, x11_display->damage_event_base); } @@ -415,7 +415,7 @@ query_xfixes_extension (MetaX11Display *x11_display) meta_fatal ("Mutter requires XFixes 5.0"); } - meta_verbose ("Attempted to init XFixes, found error base %d event base %d\n", + meta_verbose ("Attempted to init XFixes, found error base %d event base %d", x11_display->xfixes_error_base, x11_display->xfixes_event_base); } @@ -444,7 +444,7 @@ query_xi_extension (MetaX11Display *x11_display) } if (!has_xi) - meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer\n"); + meta_fatal ("X server doesn't have the XInput extension, version 2.2 or newer"); } /* @@ -529,7 +529,7 @@ set_desktop_geometry_hint (MetaX11Display *x11_display) data[0] = monitor_width; data[1] = monitor_height; - meta_verbose ("Setting _NET_DESKTOP_GEOMETRY to %lu, %lu\n", data[0], data[1]); + meta_verbose ("Setting _NET_DESKTOP_GEOMETRY to %lu, %lu", data[0], data[1]); meta_x11_error_trap_push (x11_display); XChangeProperty (x11_display->xdisplay, @@ -554,7 +554,7 @@ set_desktop_viewport_hint (MetaX11Display *x11_display) data[0] = 0; data[1] = 0; - meta_verbose ("Setting _NET_DESKTOP_VIEWPORT to 0, 0\n"); + meta_verbose ("Setting _NET_DESKTOP_VIEWPORT to 0, 0"); meta_x11_error_trap_push (x11_display); XChangeProperty (x11_display->xdisplay, @@ -713,7 +713,7 @@ take_manager_selection (MetaX11Display *x11_display, /* We sort of block infinitely here which is probably lame. */ - meta_verbose ("Waiting for old window manager to exit\n"); + meta_verbose ("Waiting for old window manager to exit"); do XWindowEvent (x11_display->xdisplay, current_owner, StructureNotifyMask, &event); while (event.type != DestroyNotify); @@ -821,7 +821,7 @@ set_active_workspace_hint (MetaWorkspaceManager *workspace_manager, data[0] = meta_workspace_index (workspace_manager->active_workspace); - meta_verbose ("Setting _NET_CURRENT_DESKTOP to %lu\n", data[0]); + meta_verbose ("Setting _NET_CURRENT_DESKTOP to %lu", data[0]); meta_x11_error_trap_push (x11_display); XChangeProperty (x11_display->xdisplay, @@ -845,7 +845,7 @@ set_number_of_spaces_hint (MetaWorkspaceManager *workspace_manager, data[0] = meta_workspace_manager_get_n_workspaces (workspace_manager); - meta_verbose ("Setting _NET_NUMBER_OF_DESKTOPS to %lu\n", data[0]); + meta_verbose ("Setting _NET_NUMBER_OF_DESKTOPS to %lu", data[0]); meta_x11_error_trap_push (x11_display); XChangeProperty (x11_display->xdisplay, @@ -1086,7 +1086,7 @@ meta_x11_init_gdk_display (GError **error) if (!gdk_display) { - meta_warning (_("Failed to initialize GDK\n")); + meta_warning (_("Failed to initialize GDK")); g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Failed to initialize GDK"); @@ -1104,13 +1104,13 @@ meta_x11_init_gdk_display (GError **error) scale handling */ gdk_x11_display_set_window_scale (gdk_display, 1); - meta_verbose ("Opening display '%s'\n", XDisplayName (NULL)); + meta_verbose ("Opening display '%s'", XDisplayName (NULL)); xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display); if (xdisplay == NULL) { - meta_warning (_("Failed to open X Window System display “%s”\n"), + meta_warning (_("Failed to open X Window System display “%s”"), XDisplayName (NULL)); g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, @@ -1193,7 +1193,7 @@ meta_x11_display_new (MetaDisplay *display, GError **error) */ if (xroot == None) { - meta_warning (_("Screen %d on display “%s” is invalid\n"), + meta_warning (_("Screen %d on display “%s” is invalid"), number, XDisplayName (NULL)); g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, @@ -1230,7 +1230,7 @@ meta_x11_display_new (MetaDisplay *display, GError **error) x11_display->default_xvisual = DefaultVisualOfScreen (xscreen); x11_display->default_depth = DefaultDepthOfScreen (xscreen); - meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names)); + meta_verbose ("Creating %d atoms", (int) G_N_ELEMENTS (atom_names)); XInternAtoms (xdisplay, (char **)atom_names, G_N_ELEMENTS (atom_names), False, atoms); @@ -1432,7 +1432,7 @@ meta_x11_display_restore_active_workspace (MetaX11Display *x11_display) x11_display->atom__NET_CURRENT_DESKTOP, ¤t_workspace_index)) { - meta_verbose ("Read existing _NET_CURRENT_DESKTOP = %d\n", + meta_verbose ("Read existing _NET_CURRENT_DESKTOP = %d", (int) current_workspace_index); /* Switch to the _NET_CURRENT_DESKTOP workspace */ @@ -1444,7 +1444,7 @@ meta_x11_display_restore_active_workspace (MetaX11Display *x11_display) } else { - meta_verbose ("No _NET_CURRENT_DESKTOP present\n"); + meta_verbose ("No _NET_CURRENT_DESKTOP present"); } set_active_workspace_hint (display->workspace_manager, x11_display); @@ -2133,7 +2133,7 @@ meta_x11_display_update_workspace_names (MetaX11Display *x11_display) x11_display->atom__NET_DESKTOP_NAMES, &names, &n_names)) { - meta_verbose ("Failed to get workspace names from root window\n"); + meta_verbose ("Failed to get workspace names from root window"); return; } @@ -2141,7 +2141,7 @@ meta_x11_display_update_workspace_names (MetaX11Display *x11_display) while (i < n_names) { meta_topic (META_DEBUG_PREFS, - "Setting workspace %d name to \"%s\" due to _NET_DESKTOP_NAMES change\n", + "Setting workspace %d name to \"%s\" due to _NET_DESKTOP_NAMES change", i, names[i] ? names[i] : "null"); meta_prefs_change_workspace_name (i, names[i]); @@ -2194,7 +2194,7 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display) vertical_layout = TRUE; break; default: - meta_warning ("Someone set a weird orientation in _NET_DESKTOP_LAYOUT\n"); + meta_warning ("Someone set a weird orientation in _NET_DESKTOP_LAYOUT"); break; } @@ -2203,7 +2203,7 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display) if (rows <= 0 && cols <= 0) { - meta_warning ("Columns = %d rows = %d in _NET_DESKTOP_LAYOUT makes no sense\n", rows, cols); + meta_warning ("Columns = %d rows = %d in _NET_DESKTOP_LAYOUT makes no sense", rows, cols); } else { @@ -2235,7 +2235,7 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display) starting_corner = META_DISPLAY_BOTTOMLEFT; break; default: - meta_warning ("Someone set a weird starting corner in _NET_DESKTOP_LAYOUT\n"); + meta_warning ("Someone set a weird starting corner in _NET_DESKTOP_LAYOUT"); break; } } @@ -2243,7 +2243,7 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display) else { meta_warning ("Someone set _NET_DESKTOP_LAYOUT to %d integers instead of 4 " - "(3 is accepted for backwards compat)\n", n_items); + "(3 is accepted for backwards compat)", n_items); } g_free (list); diff --git a/src/x11/meta-x11-stack.c b/src/x11/meta-x11-stack.c index a8fb6733e..6a370644e 100644 --- a/src/x11/meta-x11-stack.c +++ b/src/x11/meta-x11-stack.c @@ -191,7 +191,7 @@ x11_stack_do_window_additions (MetaX11Stack *x11_stack) if (n_added > 0) { meta_topic (META_DEBUG_STACK, - "Adding %d windows to sorted list\n", + "Adding %d windows to sorted list", n_added); /* stack->added has the most recent additions at the @@ -235,7 +235,7 @@ x11_stack_sync_to_xserver (MetaX11Stack *x11_stack) GList *tmp; GList *sorted; - meta_topic (META_DEBUG_STACK, "Syncing window stack to server\n"); + meta_topic (META_DEBUG_STACK, "Syncing window stack to server"); /* Create stacked xwindow arrays, in bottom-to-top order */ diff --git a/src/x11/meta-x11-window-control.c b/src/x11/meta-x11-window-control.c index aaf3d7fe1..3af43ce0c 100644 --- a/src/x11/meta-x11-window-control.c +++ b/src/x11/meta-x11-window-control.c @@ -44,7 +44,7 @@ window_from_frame (MetaX11Display *x11_display, window = meta_x11_display_lookup_x_window (x11_display, frame_xwindow); if (!window || !window->frame) { - meta_bug ("No such frame window 0x%lx!\n", frame_xwindow); + meta_bug ("No such frame window 0x%lx!", frame_xwindow); return NULL; } @@ -250,7 +250,7 @@ meta_x11_wm_grab_buttons (MetaX11Display *x11_display, display = meta_x11_display_get_display (x11_display); - meta_verbose ("Grabbing buttons on frame 0x%lx\n", frame_xwindow); + meta_verbose ("Grabbing buttons on frame 0x%lx", frame_xwindow); meta_display_grab_window_buttons (display, frame_xwindow); } diff --git a/src/x11/session.c b/src/x11/session.c index 38929105c..8072db727 100644 --- a/src/x11/session.c +++ b/src/x11/session.c @@ -38,7 +38,7 @@ void meta_session_init (const char *client_id, const char *save_file) { - meta_topic (META_DEBUG_SM, "Compiled without session management support\n"); + meta_topic (META_DEBUG_SM, "Compiled without session management support"); } const MetaWindowSessionInfo* @@ -233,7 +233,7 @@ meta_session_init (const char *previous_client_id, SmcCallbacks callbacks; char *saved_client_id; - meta_topic (META_DEBUG_SM, "Initializing session with save file '%s'\n", + meta_topic (META_DEBUG_SM, "Initializing session with save file '%s'", previous_save_file ? previous_save_file : "(none)"); if (previous_save_file) @@ -283,7 +283,7 @@ meta_session_init (const char *previous_client_id, if (session_connection == NULL) { meta_topic (META_DEBUG_SM, - "Failed to a open connection to a session manager, so window positions will not be saved: %s\n", + "Failed to a open connection to a session manager, so window positions will not be saved: %s", buf); goto out; @@ -292,7 +292,7 @@ meta_session_init (const char *previous_client_id, { if (client_id == NULL) meta_bug ("Session manager gave us a NULL client ID?"); - meta_topic (META_DEBUG_SM, "Obtained session ID '%s'\n", client_id); + meta_topic (META_DEBUG_SM, "Obtained session ID '%s'", client_id); } if (previous_client_id && strcmp (previous_client_id, client_id) == 0) @@ -389,7 +389,7 @@ save_yourself_possibly_done (gboolean shutdown, gboolean successful) { meta_topic (META_DEBUG_SM, - "save possibly done shutdown = %d success = %d\n", + "save possibly done shutdown = %d success = %d", shutdown, successful); if (current_state == STATE_SAVING_PHASE_1) @@ -404,7 +404,7 @@ save_yourself_possibly_done (gboolean shutdown, current_state = STATE_WAITING_FOR_PHASE_2; meta_topic (META_DEBUG_SM, - "Requested phase 2, status = %d\n", status); + "Requested phase 2, status = %d", status); } if (current_state == STATE_SAVING_PHASE_2 && @@ -424,7 +424,7 @@ save_yourself_possibly_done (gboolean shutdown, current_state = STATE_WAITING_FOR_INTERACT; meta_topic (META_DEBUG_SM, - "Requested interact, status = %d\n", status); + "Requested interact, status = %d", status); } if (current_state == STATE_SAVING_PHASE_1 || @@ -432,7 +432,7 @@ save_yourself_possibly_done (gboolean shutdown, current_state == STATE_DONE_WITH_INTERACT || current_state == STATE_SKIPPING_GLOBAL_SAVE) { - meta_topic (META_DEBUG_SM, "Sending SaveYourselfDone\n"); + meta_topic (META_DEBUG_SM, "Sending SaveYourselfDone"); SmcSaveYourselfDone (session_connection, successful); @@ -546,13 +546,13 @@ static void save_complete_callback (SmcConn smc_conn, SmPointer client_data) { /* nothing */ - meta_topic (META_DEBUG_SM, "SaveComplete received\n"); + meta_topic (META_DEBUG_SM, "SaveComplete received"); } static void shutdown_cancelled_callback (SmcConn smc_conn, SmPointer client_data) { - meta_topic (META_DEBUG_SM, "Shutdown cancelled received\n"); + meta_topic (META_DEBUG_SM, "Shutdown cancelled received"); if (session_connection != NULL && (current_state != STATE_IDLE && current_state != STATE_FROZEN)) @@ -568,7 +568,7 @@ interact_callback (SmcConn smc_conn, SmPointer client_data) /* nothing */ gboolean shutdown; - meta_topic (META_DEBUG_SM, "Interaction permission received\n"); + meta_topic (META_DEBUG_SM, "Interaction permission received"); shutdown = GPOINTER_TO_INT (client_data); @@ -849,24 +849,24 @@ save_state (void) if (mkdir (mutter_dir, 0700) < 0 && errno != EEXIST) { - meta_warning ("Could not create directory '%s': %s\n", + meta_warning ("Could not create directory '%s': %s", mutter_dir, g_strerror (errno)); } if (mkdir (session_dir, 0700) < 0 && errno != EEXIST) { - meta_warning ("Could not create directory '%s': %s\n", + meta_warning ("Could not create directory '%s': %s", session_dir, g_strerror (errno)); } - meta_topic (META_DEBUG_SM, "Saving session to '%s'\n", full_save_file ()); + meta_topic (META_DEBUG_SM, "Saving session to '%s'", full_save_file ()); outfile = fopen (full_save_file (), "w"); if (outfile == NULL) { - meta_warning ("Could not open session file '%s' for writing: %s\n", + meta_warning ("Could not open session file '%s' for writing: %s", full_save_file (), g_strerror (errno)); goto out; } @@ -928,7 +928,7 @@ save_state (void) else title = NULL; - meta_topic (META_DEBUG_SM, "Saving session managed window %s, client ID '%s'\n", + meta_topic (META_DEBUG_SM, "Saving session managed window %s, client ID '%s'", window->desc, window->sm_client_id); fprintf (outfile, @@ -992,7 +992,7 @@ save_state (void) } else { - meta_topic (META_DEBUG_SM, "Not saving window '%s', not session managed\n", + meta_topic (META_DEBUG_SM, "Not saving window '%s', not session managed", window->desc); } @@ -1010,12 +1010,12 @@ save_state (void) /* FIXME need a dialog for this */ if (ferror (outfile)) { - meta_warning ("Error writing session file '%s': %s\n", + meta_warning ("Error writing session file '%s': %s", full_save_file (), g_strerror (errno)); } if (fclose (outfile)) { - meta_warning ("Error closing session file '%s': %s\n", + meta_warning ("Error closing session file '%s': %s", full_save_file (), g_strerror (errno)); } } @@ -1117,7 +1117,7 @@ load_state (const char *previous_save_file) g_free (canonical_session_file); } - meta_topic (META_DEBUG_SM, "Parsing saved session file %s\n", session_file); + meta_topic (META_DEBUG_SM, "Parsing saved session file %s", session_file); g_free (session_file); session_file = NULL; @@ -1145,7 +1145,7 @@ load_state (const char *previous_save_file) error: - meta_warning ("Failed to parse saved session file: %s\n", + meta_warning ("Failed to parse saved session file: %s", error->message); g_error_free (error); @@ -1395,7 +1395,7 @@ start_element_handler (GMarkupParseContext *context, } if (pd->info->saved_rect_set) - meta_topic (META_DEBUG_SM, "Saved unmaximized size %d,%d %dx%d \n", + meta_topic (META_DEBUG_SM, "Saved unmaximized size %d,%d %dx%d ", pd->info->saved_rect.x, pd->info->saved_rect.y, pd->info->saved_rect.width, @@ -1454,7 +1454,7 @@ start_element_handler (GMarkupParseContext *context, ++i; } - meta_topic (META_DEBUG_SM, "Loaded geometry %d,%d %dx%d gravity %s\n", + meta_topic (META_DEBUG_SM, "Loaded geometry %d,%d %dx%d gravity %s", pd->info->rect.x, pd->info->rect.y, pd->info->rect.width, @@ -1489,7 +1489,7 @@ end_element_handler (GMarkupParseContext *context, window_info_list = g_slist_prepend (window_info_list, pd->info); - meta_topic (META_DEBUG_SM, "Loaded window info from session with class: %s name: %s role: %s\n", + meta_topic (META_DEBUG_SM, "Loaded window info from session with class: %s name: %s role: %s", pd->info->res_class ? pd->info->res_class : "(none)", pd->info->res_name ? pd->info->res_name : "(none)", pd->info->role ? pd->info->role : "(none)"); @@ -1547,7 +1547,7 @@ get_possible_matches (MetaWindow *window) both_null_or_matching (info->res_name, window->res_name) && both_null_or_matching (info->role, window->role)) { - meta_topic (META_DEBUG_SM, "Window %s may match saved window with class: %s name: %s role: %s\n", + meta_topic (META_DEBUG_SM, "Window %s may match saved window with class: %s name: %s role: %s", window->desc, info->res_class ? info->res_class : "(none)", info->res_name ? info->res_name : "(none)", @@ -1560,28 +1560,28 @@ get_possible_matches (MetaWindow *window) if (meta_is_verbose ()) { if (!both_null_or_matching (info->id, window->sm_client_id)) - meta_topic (META_DEBUG_SM, "Window %s has SM client ID %s, saved state has %s, no match\n", + meta_topic (META_DEBUG_SM, "Window %s has SM client ID %s, saved state has %s, no match", window->desc, window->sm_client_id ? window->sm_client_id : "(none)", info->id ? info->id : "(none)"); else if (!both_null_or_matching (info->res_class, window->res_class)) - meta_topic (META_DEBUG_SM, "Window %s has class %s doesn't match saved class %s, no match\n", + meta_topic (META_DEBUG_SM, "Window %s has class %s doesn't match saved class %s, no match", window->desc, window->res_class ? window->res_class : "(none)", info->res_class ? info->res_class : "(none)"); else if (!both_null_or_matching (info->res_name, window->res_name)) - meta_topic (META_DEBUG_SM, "Window %s has name %s doesn't match saved name %s, no match\n", + meta_topic (META_DEBUG_SM, "Window %s has name %s doesn't match saved name %s, no match", window->desc, window->res_name ? window->res_name : "(none)", info->res_name ? info->res_name : "(none)"); else if (!both_null_or_matching (info->role, window->role)) - meta_topic (META_DEBUG_SM, "Window %s has role %s doesn't match saved role %s, no match\n", + meta_topic (META_DEBUG_SM, "Window %s has role %s doesn't match saved role %s, no match", window->desc, window->role ? window->role : "(none)", info->role ? info->role : "(none)"); else - meta_topic (META_DEBUG_SM, "???? should not happen - window %s doesn't match saved state %s for no good reason\n", + meta_topic (META_DEBUG_SM, "???? should not happen - window %s doesn't match saved state %s for no good reason", window->desc, info->id); } } @@ -1649,7 +1649,7 @@ meta_window_lookup_saved_state (MetaWindow *window) if (window->sm_client_id == NULL) { meta_topic (META_DEBUG_SM, - "Window %s is not session managed, not checking for saved state\n", + "Window %s is not session managed, not checking for saved state", window->desc); return NULL; } @@ -1658,7 +1658,8 @@ meta_window_lookup_saved_state (MetaWindow *window) if (possibles == NULL) { - meta_topic (META_DEBUG_SM, "Window %s has no possible matches in the list of saved window states\n", + meta_topic (META_DEBUG_SM, + "Window %s has no possible matches in the list of saved window states", window->desc); return NULL; } diff --git a/src/x11/window-props.c b/src/x11/window-props.c index 11bf50c88..d0ef19f79 100644 --- a/src/x11/window-props.c +++ b/src/x11/window-props.c @@ -216,7 +216,7 @@ reload_wm_client_machine (MetaWindow *window, if (value->type != META_PROP_VALUE_INVALID) window->wm_client_machine = g_strdup (value->v.str); - meta_verbose ("Window has client machine \"%s\"\n", + meta_verbose ("Window has client machine \"%s\"", window->wm_client_machine ? window->wm_client_machine : "unset"); if (window->wm_client_machine == NULL) @@ -238,7 +238,7 @@ complain_about_broken_client (MetaWindow *window, MetaPropValue *value, gboolean initial) { - meta_warning ("Broken client! Window %s changed client leader window or SM client ID\n", + meta_warning ("Broken client! Window %s changed client leader window or SM client ID", window->desc); } @@ -324,7 +324,7 @@ reload_icon_geometry (MetaWindow *window, { if (value->v.cardinal_list.n_cardinals != 4) { - meta_verbose ("_NET_WM_ICON_GEOMETRY on %s has %d values instead of 4\n", + meta_verbose ("_NET_WM_ICON_GEOMETRY on %s has %d values instead of 4", window->desc, value->v.cardinal_list.n_cardinals); } else @@ -391,7 +391,7 @@ reload_gtk_frame_extents (MetaWindow *window, { if (value->v.cardinal_list.n_cardinals != 4) { - meta_verbose ("_GTK_FRAME_EXTENTS on %s has %d values instead of 4\n", + meta_verbose ("_GTK_FRAME_EXTENTS on %s has %d values instead of 4", window->desc, value->v.cardinal_list.n_cardinals); } else @@ -605,7 +605,7 @@ reload_net_wm_name (MetaWindow *window, set_window_title (window, value->v.str); priv->using_net_wm_name = TRUE; - meta_verbose ("Using _NET_WM_NAME for new title of %s: \"%s\"\n", + meta_verbose ("Using _NET_WM_NAME for new title of %s: \"%s\"", window->desc, window->title); } else @@ -627,7 +627,7 @@ reload_wm_name (MetaWindow *window, if (priv->using_net_wm_name) { - meta_verbose ("Ignoring WM_NAME \"%s\" as _NET_WM_NAME is set\n", + meta_verbose ("Ignoring WM_NAME \"%s\" as _NET_WM_NAME is set", value->v.str); return; } @@ -636,7 +636,7 @@ reload_wm_name (MetaWindow *window, { set_window_title (window, value->v.str); - meta_verbose ("Using WM_NAME for new title of %s: \"%s\"\n", + meta_verbose ("Using WM_NAME for new title of %s: \"%s\"", window->desc, window->title); } else @@ -774,7 +774,7 @@ reload_net_wm_state (MetaWindow *window, if (!initial) { /* no, they DON'T change the property */ meta_verbose ("Ignoring _NET_WM_STATE: we should be the one who set " - "the property in the first place\n"); + "the property in the first place"); return; } @@ -826,7 +826,7 @@ reload_net_wm_state (MetaWindow *window, ++i; } - meta_verbose ("Reloaded _NET_WM_STATE for %s\n", + meta_verbose ("Reloaded _NET_WM_STATE for %s", window->desc); meta_window_x11_recalc_window_type (window); @@ -851,7 +851,7 @@ reload_mwm_hints (MetaWindow *window, if (value->type == META_PROP_VALUE_INVALID) { - meta_verbose ("Window %s has no MWM hints\n", window->desc); + meta_verbose ("Window %s has no MWM hints", window->desc); meta_window_recalc_features (window); return; } @@ -860,13 +860,13 @@ reload_mwm_hints (MetaWindow *window, /* We support those MWM hints deemed non-stupid */ - meta_verbose ("Window %s has MWM hints\n", + meta_verbose ("Window %s has MWM hints", window->desc); if (hints->flags & MWM_HINTS_DECORATIONS) { - meta_verbose ("Window %s sets MWM_HINTS_DECORATIONS 0x%x\n", - window->desc, hints->decorations); + meta_verbose ("Window %s sets MWM_HINTS_DECORATIONS 0x%x", + window->desc, hints->decorations); if (hints->decorations == 0) window->mwm_decorated = FALSE; @@ -875,13 +875,13 @@ reload_mwm_hints (MetaWindow *window, window->mwm_border_only = TRUE; } else - meta_verbose ("Decorations flag unset\n"); + meta_verbose ("Decorations flag unset"); if (hints->flags & MWM_HINTS_FUNCTIONS) { gboolean toggle_value; - meta_verbose ("Window %s sets MWM_HINTS_FUNCTIONS 0x%x\n", + meta_verbose ("Window %s sets MWM_HINTS_FUNCTIONS 0x%x", window->desc, hints->functions); /* If _ALL is specified, then other flags indicate what to turn off; @@ -893,7 +893,7 @@ reload_mwm_hints (MetaWindow *window, { toggle_value = TRUE; - meta_verbose ("Window %s disables all funcs then reenables some\n", + meta_verbose ("Window %s disables all funcs then reenables some", window->desc); window->mwm_has_close_func = FALSE; window->mwm_has_minimize_func = FALSE; @@ -903,44 +903,46 @@ reload_mwm_hints (MetaWindow *window, } else { - meta_verbose ("Window %s enables all funcs then disables some\n", + meta_verbose ("Window %s enables all funcs then disables some", window->desc); toggle_value = FALSE; } if ((hints->functions & MWM_FUNC_CLOSE) != 0) { - meta_verbose ("Window %s toggles close via MWM hints\n", + meta_verbose ("Window %s toggles close via MWM hints", window->desc); window->mwm_has_close_func = toggle_value; } if ((hints->functions & MWM_FUNC_MINIMIZE) != 0) { - meta_verbose ("Window %s toggles minimize via MWM hints\n", + meta_verbose ("Window %s toggles minimize via MWM hints", window->desc); window->mwm_has_minimize_func = toggle_value; } if ((hints->functions & MWM_FUNC_MAXIMIZE) != 0) { - meta_verbose ("Window %s toggles maximize via MWM hints\n", + meta_verbose ("Window %s toggles maximize via MWM hints", window->desc); window->mwm_has_maximize_func = toggle_value; } if ((hints->functions & MWM_FUNC_MOVE) != 0) { - meta_verbose ("Window %s toggles move via MWM hints\n", + meta_verbose ("Window %s toggles move via MWM hints", window->desc); window->mwm_has_move_func = toggle_value; } if ((hints->functions & MWM_FUNC_RESIZE) != 0) { - meta_verbose ("Window %s toggles resize via MWM hints\n", + meta_verbose ("Window %s toggles resize via MWM hints", window->desc); window->mwm_has_resize_func = toggle_value; } } else - meta_verbose ("Functions flag unset\n"); + { + meta_verbose ("Functions flag unset"); + } meta_window_recalc_features (window); @@ -982,10 +984,10 @@ reload_wm_class (MetaWindow *window, meta_window_set_wm_class (window, NULL, NULL); } - meta_verbose ("Window %s class: '%s' name: '%s'\n", - window->desc, - window->res_class ? window->res_class : "none", - window->res_name ? window->res_name : "none"); + meta_verbose ("Window %s class: '%s' name: '%s'", + window->desc, + window->res_class ? window->res_class : "none", + window->res_name ? window->res_name : "none"); } static void @@ -998,7 +1000,7 @@ reload_net_wm_desktop (MetaWindow *window, window->initial_workspace_set = TRUE; window->initial_workspace = value->v.cardinal; meta_topic (META_DEBUG_PLACEMENT, - "Read initial workspace prop %d for %s\n", + "Read initial workspace prop %d for %s", window->initial_workspace, window->desc); } } @@ -1038,7 +1040,7 @@ reload_net_startup_id (MetaWindow *window, } } - meta_verbose ("New _NET_STARTUP_ID \"%s\" for %s\n", + meta_verbose ("New _NET_STARTUP_ID \"%s\" for %s", window->startup_id ? window->startup_id : "unset", window->desc); } @@ -1055,7 +1057,7 @@ reload_update_counter (MetaWindow *window, if (value->v.xcounter_list.n_counters == 0) { - meta_warning ("_NET_WM_SYNC_REQUEST_COUNTER is empty\n"); + meta_warning ("_NET_WM_SYNC_REQUEST_COUNTER is empty"); return; } @@ -1069,7 +1071,7 @@ reload_update_counter (MetaWindow *window, window->sync_request_counter = value->v.xcounter_list.counters[1]; window->extended_sync_request_counter = TRUE; } - meta_verbose ("Window has _NET_WM_SYNC_REQUEST_COUNTER 0x%lx (extended=%s)\n", + meta_verbose ("Window has _NET_WM_SYNC_REQUEST_COUNTER 0x%lx (extended=%s)", window->sync_request_counter, window->extended_sync_request_counter ? "true" : "false"); @@ -1094,46 +1096,46 @@ spew_size_hints_differences (const XSizeHints *old, const XSizeHints *new) { if (FLAG_CHANGED (old, new, USPosition)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: USPosition now %s\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: USPosition now %s", FLAG_TOGGLED_ON (old, new, USPosition) ? "set" : "unset"); if (FLAG_CHANGED (old, new, USSize)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: USSize now %s\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: USSize now %s", FLAG_TOGGLED_ON (old, new, USSize) ? "set" : "unset"); if (FLAG_CHANGED (old, new, PPosition)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PPosition now %s\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PPosition now %s", FLAG_TOGGLED_ON (old, new, PPosition) ? "set" : "unset"); if (FLAG_CHANGED (old, new, PSize)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PSize now %s\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PSize now %s", FLAG_TOGGLED_ON (old, new, PSize) ? "set" : "unset"); if (FLAG_CHANGED (old, new, PMinSize)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PMinSize now %s (%d x %d -> %d x %d)\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PMinSize now %s (%d x %d -> %d x %d)", FLAG_TOGGLED_ON (old, new, PMinSize) ? "set" : "unset", old->min_width, old->min_height, new->min_width, new->min_height); if (FLAG_CHANGED (old, new, PMaxSize)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PMaxSize now %s (%d x %d -> %d x %d)\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PMaxSize now %s (%d x %d -> %d x %d)", FLAG_TOGGLED_ON (old, new, PMaxSize) ? "set" : "unset", old->max_width, old->max_height, new->max_width, new->max_height); if (FLAG_CHANGED (old, new, PResizeInc)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PResizeInc now %s (width_inc %d -> %d height_inc %d -> %d)\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PResizeInc now %s (width_inc %d -> %d height_inc %d -> %d)", FLAG_TOGGLED_ON (old, new, PResizeInc) ? "set" : "unset", old->width_inc, new->width_inc, old->height_inc, new->height_inc); if (FLAG_CHANGED (old, new, PAspect)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PAspect now %s (min %d/%d -> %d/%d max %d/%d -> %d/%d)\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PAspect now %s (min %d/%d -> %d/%d max %d/%d -> %d/%d)", FLAG_TOGGLED_ON (old, new, PAspect) ? "set" : "unset", old->min_aspect.x, old->min_aspect.y, new->min_aspect.x, new->min_aspect.y, old->max_aspect.x, old->max_aspect.y, new->max_aspect.x, new->max_aspect.y); if (FLAG_CHANGED (old, new, PBaseSize)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PBaseSize now %s (%d x %d -> %d x %d)\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PBaseSize now %s (%d x %d -> %d x %d)", FLAG_TOGGLED_ON (old, new, PBaseSize) ? "set" : "unset", old->base_width, old->base_height, new->base_width, new->base_height); if (FLAG_CHANGED (old, new, PWinGravity)) - meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PWinGravity now %s (%d -> %d)\n", + meta_topic (META_DEBUG_GEOMETRY, "XSizeHints: PWinGravity now %s (%d -> %d)", FLAG_TOGGLED_ON (old, new, PWinGravity) ? "set" : "unset", old->win_gravity, new->win_gravity); } @@ -1183,7 +1185,7 @@ meta_set_normal_hints (MetaWindow *window, /* Get base size hints */ if (window->size_hints.flags & PBaseSize) { - meta_topic (META_DEBUG_GEOMETRY, "Window %s sets base size %d x %d\n", + meta_topic (META_DEBUG_GEOMETRY, "Window %s sets base size %d x %d", window->desc, window->size_hints.base_width, window->size_hints.base_height); @@ -1203,7 +1205,7 @@ meta_set_normal_hints (MetaWindow *window, /* Get min size hints */ if (window->size_hints.flags & PMinSize) { - meta_topic (META_DEBUG_GEOMETRY, "Window %s sets min size %d x %d\n", + meta_topic (META_DEBUG_GEOMETRY, "Window %s sets min size %d x %d", window->desc, window->size_hints.min_width, window->size_hints.min_height); @@ -1223,7 +1225,7 @@ meta_set_normal_hints (MetaWindow *window, /* Get max size hints */ if (window->size_hints.flags & PMaxSize) { - meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max size %d x %d\n", + meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max size %d x %d", window->desc, window->size_hints.max_width, window->size_hints.max_height); @@ -1239,7 +1241,7 @@ meta_set_normal_hints (MetaWindow *window, if (window->size_hints.flags & PResizeInc) { meta_topic (META_DEBUG_GEOMETRY, - "Window %s sets resize width inc: %d height inc: %d\n", + "Window %s sets resize width inc: %d height inc: %d", window->desc, window->size_hints.width_inc, window->size_hints.height_inc); @@ -1255,7 +1257,7 @@ meta_set_normal_hints (MetaWindow *window, if (window->size_hints.flags & PAspect) { meta_topic (META_DEBUG_GEOMETRY, - "Window %s sets min_aspect: %d/%d max_aspect: %d/%d\n", + "Window %s sets min_aspect: %d/%d max_aspect: %d/%d", window->desc, window->size_hints.min_aspect.x, window->size_hints.min_aspect.y, @@ -1274,14 +1276,14 @@ meta_set_normal_hints (MetaWindow *window, /* Get gravity hint */ if (window->size_hints.flags & PWinGravity) { - meta_topic (META_DEBUG_GEOMETRY, "Window %s sets gravity %d\n", + meta_topic (META_DEBUG_GEOMETRY, "Window %s sets gravity %d", window->desc, window->size_hints.win_gravity); } else { meta_topic (META_DEBUG_GEOMETRY, - "Window %s doesn't set gravity, using NW\n", + "Window %s doesn't set gravity, using NW", window->desc); window->size_hints.win_gravity = META_GRAVITY_NORTH_WEST; window->size_hints.flags |= PWinGravity; @@ -1294,7 +1296,7 @@ meta_set_normal_hints (MetaWindow *window, { /* someone is on crack */ meta_topic (META_DEBUG_GEOMETRY, - "Window %s sets min width to 0, which makes no sense\n", + "Window %s sets min width to 0, which makes no sense", window->desc); window->size_hints.min_width = 1; } @@ -1302,7 +1304,7 @@ meta_set_normal_hints (MetaWindow *window, { /* another cracksmoker */ meta_topic (META_DEBUG_GEOMETRY, - "Window %s sets max width to 0, which makes no sense\n", + "Window %s sets max width to 0, which makes no sense", window->desc); window->size_hints.max_width = 1; } @@ -1310,7 +1312,7 @@ meta_set_normal_hints (MetaWindow *window, { /* another cracksmoker */ meta_topic (META_DEBUG_GEOMETRY, - "Window %s sets min height to 0, which makes no sense\n", + "Window %s sets min height to 0, which makes no sense", window->desc); window->size_hints.min_height = 1; } @@ -1318,7 +1320,7 @@ meta_set_normal_hints (MetaWindow *window, { /* another cracksmoker */ meta_topic (META_DEBUG_GEOMETRY, - "Window %s sets max height to 0, which makes no sense\n", + "Window %s sets max height to 0, which makes no sense", window->desc); window->size_hints.max_height = 1; } @@ -1328,13 +1330,13 @@ meta_set_normal_hints (MetaWindow *window, { /* app authors find so many ways to smoke crack */ window->size_hints.width_inc = 1; - meta_topic (META_DEBUG_GEOMETRY, "Corrected 0 width_inc to 1\n"); + meta_topic (META_DEBUG_GEOMETRY, "Corrected 0 width_inc to 1"); } if (window->size_hints.height_inc < 1) { /* another cracksmoker */ window->size_hints.height_inc = 1; - meta_topic (META_DEBUG_GEOMETRY, "Corrected 0 height_inc to 1\n"); + meta_topic (META_DEBUG_GEOMETRY, "Corrected 0 height_inc to 1"); } /* divide by 0 cracksmokers; note that x & y in (min|max)_aspect are * numerator & denominator @@ -1362,7 +1364,7 @@ meta_set_normal_hints (MetaWindow *window, meta_topic (META_DEBUG_GEOMETRY, "Window %s has width_inc (%d) that does not evenly divide " "min_width - base_width (%d - %d); thus effective " - "min_width is really %d\n", + "min_width is really %d", window->desc, winc, minw, basew, window->size_hints.min_width); minw = window->size_hints.min_width; @@ -1375,7 +1377,7 @@ meta_set_normal_hints (MetaWindow *window, meta_topic (META_DEBUG_GEOMETRY, "Window %s has width_inc (%d) that does not evenly divide " "max_width - base_width (%d - %d); thus effective " - "max_width is really %d\n", + "max_width is really %d", window->desc, winc, maxw, basew, window->size_hints.max_width); maxw = window->size_hints.max_width; @@ -1388,7 +1390,7 @@ meta_set_normal_hints (MetaWindow *window, meta_topic (META_DEBUG_GEOMETRY, "Window %s has height_inc (%d) that does not evenly divide " "min_height - base_height (%d - %d); thus effective " - "min_height is really %d\n", + "min_height is really %d", window->desc, hinc, minh, baseh, window->size_hints.min_height); minh = window->size_hints.min_height; @@ -1401,7 +1403,7 @@ meta_set_normal_hints (MetaWindow *window, meta_topic (META_DEBUG_GEOMETRY, "Window %s has height_inc (%d) that does not evenly divide " "max_height - base_height (%d - %d); thus effective " - "max_height is really %d\n", + "max_height is really %d", window->desc, hinc, maxh, baseh, window->size_hints.max_height); maxh = window->size_hints.max_height; @@ -1415,7 +1417,7 @@ meta_set_normal_hints (MetaWindow *window, /* another cracksmoker */ meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max width %d less than min width %d, " - "disabling resize\n", + "disabling resize", window->desc, window->size_hints.max_width, window->size_hints.min_width); @@ -1426,7 +1428,7 @@ meta_set_normal_hints (MetaWindow *window, /* another cracksmoker */ meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max height %d less than min height %d, " - "disabling resize\n", + "disabling resize", window->desc, window->size_hints.max_height, window->size_hints.min_height); @@ -1443,7 +1445,7 @@ meta_set_normal_hints (MetaWindow *window, /* another cracksmoker; not even minimally (self) consistent */ meta_topic (META_DEBUG_GEOMETRY, "Window %s sets min aspect ratio larger than max aspect " - "ratio; disabling aspect ratio constraints.\n", + "ratio; disabling aspect ratio constraints.", window->desc); window->size_hints.min_aspect.x = 1; window->size_hints.min_aspect.y = G_MAXINT; @@ -1458,7 +1460,7 @@ meta_set_normal_hints (MetaWindow *window, meta_topic (META_DEBUG_GEOMETRY, "Window %s sets min aspect ratio larger than largest " "aspect ratio possible given min/max size constraints; " - "disabling min aspect ratio constraint.\n", + "disabling min aspect ratio constraint.", window->desc); window->size_hints.min_aspect.x = 1; window->size_hints.min_aspect.y = G_MAXINT; @@ -1469,7 +1471,7 @@ meta_set_normal_hints (MetaWindow *window, meta_topic (META_DEBUG_GEOMETRY, "Window %s sets max aspect ratio smaller than smallest " "aspect ratio possible given min/max size constraints; " - "disabling max aspect ratio constraint.\n", + "disabling max aspect ratio constraint.", window->desc); window->size_hints.max_aspect.x = G_MAXINT; window->size_hints.max_aspect.y = 1; @@ -1489,7 +1491,7 @@ reload_normal_hints (MetaWindow *window, { XSizeHints old_hints; - meta_topic (META_DEBUG_GEOMETRY, "Updating WM_NORMAL_HINTS for %s\n", window->desc); + meta_topic (META_DEBUG_GEOMETRY, "Updating WM_NORMAL_HINTS for %s", window->desc); old_hints = window->size_hints; @@ -1533,7 +1535,7 @@ reload_wm_protocols (MetaWindow *window, ++i; } - meta_verbose ("New _NET_STARTUP_ID \"%s\" for %s\n", + meta_verbose ("New _NET_STARTUP_ID \"%s\" for %s", window->startup_id ? window->startup_id : "unset", window->desc); } @@ -1580,7 +1582,7 @@ reload_wm_hints (MetaWindow *window, if (hints->flags & XUrgencyHint) urgent = TRUE; - meta_verbose ("Read WM_HINTS input: %d iconic: %d group leader: 0x%lx pixmap: 0x%lx mask: 0x%lx\n", + meta_verbose ("Read WM_HINTS input: %d iconic: %d group leader: 0x%lx pixmap: 0x%lx mask: 0x%lx", window->input, window->initially_iconic, window->xgroup_leader, priv->wm_hints_pixmap, @@ -1589,7 +1591,7 @@ reload_wm_hints (MetaWindow *window, if (window->xgroup_leader != old_group_leader) { - meta_verbose ("Window %s changed its group leader to 0x%lx\n", + meta_verbose ("Window %s changed its group leader to 0x%lx", window->desc, window->xgroup_leader); meta_window_group_leader_changed (window); @@ -1636,7 +1638,7 @@ reload_transient_for (MetaWindow *window, transient_for); if (!parent) { - meta_warning ("Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n", + meta_warning ("Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.", transient_for, window->desc); transient_for = None; } @@ -1653,7 +1655,7 @@ reload_transient_for (MetaWindow *window, meta_warning ("WM_TRANSIENT_FOR window %s for %s window %s is an " "override-redirect window and this is not correct " "according to the standard, so we'll fallback to " - "the first non-override-redirect window 0x%lx.\n", + "the first non-override-redirect window 0x%lx.", parent->desc, window->desc, window_kind, parent->xtransient_for); transient_for = parent->xtransient_for; @@ -1666,7 +1668,7 @@ reload_transient_for (MetaWindow *window, meta_warning ("WM_TRANSIENT_FOR window %s for %s window %s is an " "override-redirect window and this is not correct " "according to the standard, so we'll fallback to " - "the root window.\n", parent->desc, window_kind, + "the root window.", parent->desc, window_kind, window->desc); transient_for = parent->display->x11_display->xroot; parent = NULL; @@ -1677,7 +1679,7 @@ reload_transient_for (MetaWindow *window, if (check_xtransient_for_loop (window, parent)) { meta_warning ("WM_TRANSIENT_FOR window 0x%lx for %s would create a " - "loop.\n", transient_for, window->desc); + "loop.", transient_for, window->desc); transient_for = None; } } @@ -1690,9 +1692,9 @@ reload_transient_for (MetaWindow *window, window->xtransient_for = transient_for; if (window->xtransient_for != None) - meta_verbose ("Window %s transient for 0x%lx\n", window->desc, window->xtransient_for); + meta_verbose ("Window %s transient for 0x%lx", window->desc, window->xtransient_for); else - meta_verbose ("Window %s is not transient\n", window->desc); + meta_verbose ("Window %s is not transient", window->desc); if (window->xtransient_for == None || window->xtransient_for == window->display->x11_display->xroot) @@ -1714,7 +1716,7 @@ reload_gtk_theme_variant (MetaWindow *window, if (value->type != META_PROP_VALUE_INVALID) { requested_variant = value->v.str; - meta_verbose ("Requested \"%s\" theme variant for window %s.\n", + meta_verbose ("Requested \"%s\" theme variant for window %s.", requested_variant, window->desc); } @@ -1749,9 +1751,9 @@ reload_bypass_compositor (MetaWindow *window, return; if (requested_value == META_BYPASS_COMPOSITOR_HINT_ON) - meta_verbose ("Request to bypass compositor for window %s.\n", window->desc); + meta_verbose ("Request to bypass compositor for window %s.", window->desc); else if (requested_value == META_BYPASS_COMPOSITOR_HINT_OFF) - meta_verbose ("Request to don't bypass compositor for window %s.\n", window->desc); + meta_verbose ("Request to don't bypass compositor for window %s.", window->desc); else if (requested_value != META_BYPASS_COMPOSITOR_HINT_AUTO) return; diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 35cee5873..0d85a0d0a 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -183,7 +183,7 @@ update_sm_hints (MetaWindow *window) } else { - meta_verbose ("Didn't find a client leader for %s\n", window->desc); + meta_verbose ("Didn't find a client leader for %s", window->desc); if (!meta_prefs_get_disable_workarounds ()) { @@ -195,12 +195,12 @@ update_sm_hints (MetaWindow *window) &window->sm_client_id); if (window->sm_client_id) - meta_warning ("Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n", + meta_warning ("Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.", window->desc); } } - meta_verbose ("Window %s client leader: 0x%lx SM_CLIENT_ID: '%s'\n", + meta_verbose ("Window %s client leader: 0x%lx SM_CLIENT_ID: '%s'", window->desc, window->xclient_leader, window->sm_client_id ? window->sm_client_id : "none"); } @@ -251,7 +251,7 @@ send_configure_notify (MetaWindow *window) event.xconfigure.override_redirect = False; meta_topic (META_DEBUG_GEOMETRY, - "Sending synthetic configure notify to %s with x: %d y: %d w: %d h: %d\n", + "Sending synthetic configure notify to %s with x: %d y: %d w: %d h: %d", window->desc, event.xconfigure.x, event.xconfigure.y, event.xconfigure.width, event.xconfigure.height); @@ -389,7 +389,7 @@ meta_window_apply_session_info (MetaWindow *window, if (info->stack_position_set) { meta_topic (META_DEBUG_SM, - "Restoring stack position %d for window %s\n", + "Restoring stack position %d for window %s", info->stack_position, window->desc); /* FIXME well, I'm not sure how to do this. */ @@ -398,7 +398,7 @@ meta_window_apply_session_info (MetaWindow *window, if (info->minimized_set) { meta_topic (META_DEBUG_SM, - "Restoring minimized state %d for window %s\n", + "Restoring minimized state %d for window %s", info->minimized, window->desc); if (info->minimized) @@ -408,7 +408,7 @@ meta_window_apply_session_info (MetaWindow *window, if (info->maximized_set) { meta_topic (META_DEBUG_SM, - "Restoring maximized state %d for window %s\n", + "Restoring maximized state %d for window %s", info->maximized, window->desc); if (window->has_maximize_func && info->maximized) @@ -418,7 +418,7 @@ meta_window_apply_session_info (MetaWindow *window, if (info->saved_rect_set) { meta_topic (META_DEBUG_SM, - "Restoring saved rect %d,%d %dx%d for window %s\n", + "Restoring saved rect %d,%d %dx%d for window %s", info->saved_rect.x, info->saved_rect.y, info->saved_rect.width, @@ -438,7 +438,7 @@ meta_window_apply_session_info (MetaWindow *window, window->on_all_workspaces_requested = info->on_all_workspaces; meta_window_on_all_workspaces_changed (window); meta_topic (META_DEBUG_SM, - "Restoring sticky state %d for window %s\n", + "Restoring sticky state %d for window %s", window->on_all_workspaces_requested, window->desc); } @@ -478,7 +478,7 @@ meta_window_apply_session_info (MetaWindow *window, window->initial_workspace_set = TRUE; meta_topic (META_DEBUG_SM, - "Restoring saved window %s to workspace %d\n", + "Restoring saved window %s to workspace %d", window->desc, meta_workspace_index (workspace)); @@ -599,7 +599,7 @@ meta_window_x11_unmanage (MetaWindow *window) /* We need to clean off the window's state so it * won't be restored if the app maps it again. */ - meta_verbose ("Cleaning state from window %s\n", window->desc); + meta_verbose ("Cleaning state from window %s", window->desc); XDeleteProperty (x11_display->xdisplay, window->xwindow, x11_display->atom__NET_WM_DESKTOP); @@ -738,14 +738,14 @@ meta_window_x11_delete (MetaWindow *window, if (priv->wm_delete_window) { meta_topic (META_DEBUG_WINDOW_OPS, - "Deleting %s with delete_window request\n", + "Deleting %s with delete_window request", window->desc); send_icccm_message (window, x11_display->atom_WM_DELETE_WINDOW, timestamp); } else { meta_topic (META_DEBUG_WINDOW_OPS, - "Deleting %s with explicit kill\n", + "Deleting %s with explicit kill", window->desc); XKillClient (x11_display->xdisplay, window->xwindow); } @@ -758,7 +758,7 @@ meta_window_x11_kill (MetaWindow *window) MetaX11Display *x11_display = window->display->x11_display; meta_topic (META_DEBUG_WINDOW_OPS, - "Disconnecting %s with XKillClient()\n", + "Disconnecting %s with XKillClient()", window->desc); meta_x11_error_trap_push (x11_display); @@ -772,7 +772,7 @@ request_take_focus (MetaWindow *window, { MetaDisplay *display = window->display; - meta_topic (META_DEBUG_FOCUS, "WM_TAKE_FOCUS(%s, %u)\n", + meta_topic (META_DEBUG_FOCUS, "WM_TAKE_FOCUS(%s, %u)", window->desc, timestamp); send_icccm_message (window, display->x11_display->atom_WM_TAKE_FOCUS, timestamp); @@ -876,7 +876,7 @@ meta_window_x11_maybe_focus_delayed (MetaWindow *window, data->pending_focus_candidates = other_focus_candidates; meta_topic (META_DEBUG_FOCUS, - "Requesting delayed focus to %s\n", window->desc); + "Requesting delayed focus to %s", window->desc); data->unmanaged_id = g_signal_connect_swapped (window, "unmanaged", @@ -959,7 +959,7 @@ meta_window_x11_focus (MetaWindow *window, (window->shaded || !meta_window_is_focusable (window))) { meta_topic (META_DEBUG_FOCUS, - "Focusing frame of %s\n", window->desc); + "Focusing frame of %s", window->desc); meta_display_set_input_focus (window->display, window, TRUE, @@ -970,7 +970,7 @@ meta_window_x11_focus (MetaWindow *window, if (window->input) { meta_topic (META_DEBUG_FOCUS, - "Setting input focus on %s since input = true\n", + "Setting input focus on %s since input = true", window->desc); meta_display_set_input_focus (window->display, window, @@ -981,7 +981,7 @@ meta_window_x11_focus (MetaWindow *window, if (priv->wm_take_focus) { meta_topic (META_DEBUG_FOCUS, - "Sending WM_TAKE_FOCUS to %s since take_focus = true\n", + "Sending WM_TAKE_FOCUS to %s since take_focus = true", window->desc); if (!window->input) @@ -1114,7 +1114,7 @@ update_net_frame_extents (MetaWindow *window) meta_topic (META_DEBUG_GEOMETRY, "Setting _NET_FRAME_EXTENTS on managed window 0x%lx " - "to left = %lu, right = %lu, top = %lu, bottom = %lu\n", + "to left = %lu, right = %lu, top = %lu, bottom = %lu", window->xwindow, data[0], data[1], data[2], data[3]); meta_x11_error_trap_push (x11_display); @@ -1193,7 +1193,7 @@ update_gtk_edge_constraints (MetaWindow *window) data[0] = edge_constraints_to_gtk_edge_constraints (window); - meta_verbose ("Setting _GTK_EDGE_CONSTRAINTS to %lu\n", data[0]); + meta_verbose ("Setting _GTK_EDGE_CONSTRAINTS to %lu", data[0]); meta_x11_error_trap_push (x11_display); XChangeProperty (x11_display->xdisplay, @@ -1313,7 +1313,7 @@ meta_window_x11_current_workspace_changed (MetaWindow *window) data[0] = meta_window_get_net_wm_desktop (window); - meta_verbose ("Setting _NET_WM_DESKTOP of %s to %lu\n", + meta_verbose ("Setting _NET_WM_DESKTOP of %s to %lu", window->desc, data[0]); meta_x11_error_trap_push (x11_display); @@ -1594,7 +1594,7 @@ meta_window_x11_update_struts (MetaWindow *window) g_return_val_if_fail (!window->override_redirect, FALSE); - meta_verbose ("Updating struts for %s\n", window->desc); + meta_verbose ("Updating struts for %s", window->desc); old_struts = window->struts; new_struts = NULL; @@ -1606,7 +1606,7 @@ meta_window_x11_update_struts (MetaWindow *window) { if (nitems != 12) meta_verbose ("_NET_WM_STRUT_PARTIAL on %s has %d values instead " - "of 12\n", + "of 12", window->desc, nitems); else { @@ -1653,7 +1653,7 @@ meta_window_x11_update_struts (MetaWindow *window) } meta_verbose ("_NET_WM_STRUT_PARTIAL struts %u %u %u %u for " - "window %s\n", + "window %s", struts[0], struts[1], struts[2], struts[3], window->desc); } @@ -1661,7 +1661,7 @@ meta_window_x11_update_struts (MetaWindow *window) } else { - meta_verbose ("No _NET_WM_STRUT property for %s\n", + meta_verbose ("No _NET_WM_STRUT property for %s", window->desc); } @@ -1672,7 +1672,7 @@ meta_window_x11_update_struts (MetaWindow *window) &struts, &nitems)) { if (nitems != 4) - meta_verbose ("_NET_WM_STRUT on %s has %d values instead of 4\n", + meta_verbose ("_NET_WM_STRUT on %s has %d values instead of 4", window->desc, nitems); else { @@ -1712,7 +1712,7 @@ meta_window_x11_update_struts (MetaWindow *window) new_struts = g_slist_prepend (new_struts, temp); } - meta_verbose ("_NET_WM_STRUT struts %u %u %u %u for window %s\n", + meta_verbose ("_NET_WM_STRUT struts %u %u %u %u for window %s", struts[0], struts[1], struts[2], struts[3], window->desc); } @@ -1720,7 +1720,7 @@ meta_window_x11_update_struts (MetaWindow *window) } else if (!new_struts) { - meta_verbose ("No _NET_WM_STRUT property for %s\n", + meta_verbose ("No _NET_WM_STRUT property for %s", window->desc); } @@ -1995,13 +1995,14 @@ meta_window_x11_calculate_layer (MetaWindow *window) if (group_max > layer) { meta_topic (META_DEBUG_STACK, - "Promoting window %s from layer %u to %u due to group membership\n", + "Promoting window %s from layer %u to %u due to group membership", window->desc, layer, group_max); layer = group_max; } } - meta_topic (META_DEBUG_STACK, "Window %s on layer %u type = %u has_focus = %d\n", + meta_topic (META_DEBUG_STACK, + "Window %s on layer %u type = %u has_focus = %d", window->desc, layer, window->type, window->has_focus); return layer; @@ -2156,7 +2157,7 @@ meta_window_x11_set_net_wm_state (MetaWindow *window) ++i; } - meta_verbose ("Setting _NET_WM_STATE with %d atoms\n", i); + meta_verbose ("Setting _NET_WM_STATE with %d atoms", i); meta_x11_error_trap_push (x11_display); XChangeProperty (x11_display->xdisplay, window->xwindow, @@ -2182,7 +2183,7 @@ meta_window_x11_set_net_wm_state (MetaWindow *window) meta_x11_display_logical_monitor_to_xinerama_index (window->display->x11_display, window->fullscreen_monitors.right); - meta_verbose ("Setting _NET_WM_FULLSCREEN_MONITORS\n"); + meta_verbose ("Setting _NET_WM_FULLSCREEN_MONITORS"); meta_x11_error_trap_push (x11_display); XChangeProperty (x11_display->xdisplay, window->xwindow, @@ -2193,7 +2194,7 @@ meta_window_x11_set_net_wm_state (MetaWindow *window) } else { - meta_verbose ("Clearing _NET_WM_FULLSCREEN_MONITORS\n"); + meta_verbose ("Clearing _NET_WM_FULLSCREEN_MONITORS"); meta_x11_error_trap_push (x11_display); XDeleteProperty (x11_display->xdisplay, window->xwindow, @@ -2541,7 +2542,7 @@ meta_window_move_resize_request (MetaWindow *window, else { meta_topic (META_DEBUG_GEOMETRY, - "Not allowing position change for window %s PPosition 0x%lx USPosition 0x%lx type %u\n", + "Not allowing position change for window %s PPosition 0x%lx USPosition 0x%lx type %u", window->desc, window->size_hints.flags & PPosition, window->size_hints.flags & USPosition, window->type); @@ -2622,7 +2623,7 @@ meta_window_move_resize_request (MetaWindow *window, */ meta_warning ( "Treating resize request of legacy application %s as a " - "fullscreen request\n", + "fullscreen request", window->desc); meta_window_make_fullscreen_internal (window); } @@ -2703,7 +2704,7 @@ meta_window_x11_configure_request (MetaWindow *window, { meta_topic (META_DEBUG_STACK, "%s sent an xconfigure stacking request; this is " - "broken behavior and the request is being ignored.\n", + "broken behavior and the request is being ignored.", window->desc); } else if (active_window && @@ -2715,7 +2716,7 @@ meta_window_x11_configure_request (MetaWindow *window, meta_topic (META_DEBUG_STACK, "Ignoring xconfigure stacking request from %s (with " "user_time %u); currently active application is %s (with " - "user_time %u).\n", + "user_time %u).", window->desc, window->net_wm_user_time, active_window->desc, @@ -2738,7 +2739,7 @@ meta_window_x11_configure_request (MetaWindow *window, return TRUE; meta_topic (META_DEBUG_STACK, - "xconfigure stacking request from window %s sibling %s stackmode %d\n", + "xconfigure stacking request from window %s sibling %s stackmode %d", window->desc, sibling->desc, event->xconfigurerequest.detail); } restack_window (window, sibling, event->xconfigurerequest.detail); @@ -2759,7 +2760,7 @@ process_property_notify (MetaWindow *window, char *property_name = XGetAtomName (window->display->x11_display->xdisplay, event->atom); - meta_verbose ("Property notify on %s for %s\n", + meta_verbose ("Property notify on %s for %s", window->desc, property_name); XFree (property_name); } @@ -2870,7 +2871,7 @@ meta_window_x11_client_message (MetaWindow *window, { meta_warning ("Receiving a NET_CLOSE_WINDOW message for %s without " "a timestamp! This means some buggy (outdated) " - "application is on the loose!\n", + "application is on the loose!", window->desc); timestamp = meta_display_get_current_time (window->display); } @@ -2888,7 +2889,7 @@ meta_window_x11_client_message (MetaWindow *window, space = event->xclient.data.l[0]; - meta_verbose ("Request to move %s to workspace %d\n", + meta_verbose ("Request to move %s to workspace %d", window->desc, space); workspace = @@ -2900,9 +2901,9 @@ meta_window_x11_client_message (MetaWindow *window, else if (space == (int) 0xFFFFFFFF) meta_window_stick (window); else - meta_verbose ("No such workspace %d for screen\n", space); + meta_verbose ("No such workspace %d for screen", space); - meta_verbose ("Window %s now on_all_workspaces = %d\n", + meta_verbose ("Window %s now on_all_workspaces = %d", window->desc, window->on_all_workspaces); return TRUE; @@ -2933,7 +2934,7 @@ meta_window_x11_client_message (MetaWindow *window, if (meta_x11_error_trap_pop_with_return (x11_display) != Success) str2 = NULL; - meta_verbose ("Request to change _NET_WM_STATE action %lu atom1: %s atom2: %s\n", + meta_verbose ("Request to change _NET_WM_STATE action %lu atom1: %s atom2: %s", action, str1 ? str1 : "(unknown)", str2 ? str2 : "(unknown)"); @@ -3088,7 +3089,7 @@ meta_window_x11_client_message (MetaWindow *window, else if (event->xclient.message_type == x11_display->atom_WM_CHANGE_STATE) { - meta_verbose ("WM_CHANGE_STATE client message, state: %ld\n", + meta_verbose ("WM_CHANGE_STATE client message, state: %ld", event->xclient.data.l[0]); if (event->xclient.data.l[0] == IconicState) meta_window_minimize (window); @@ -3120,7 +3121,7 @@ meta_window_x11_client_message (MetaWindow *window, /* FIXME: What a braindead protocol; no timestamp?!? */ timestamp = meta_display_get_current_time_roundtrip (display); meta_topic (META_DEBUG_WINDOW_OPS, - "Received _NET_WM_MOVERESIZE message on %s, %d,%d action = %d, button %d\n", + "Received _NET_WM_MOVERESIZE message on %s, %d,%d action = %d, button %d", window->desc, x_root, y_root, action, button); @@ -3186,7 +3187,7 @@ meta_window_x11_client_message (MetaWindow *window, int button_mask; meta_topic (META_DEBUG_WINDOW_OPS, - "Beginning move/resize with button = %d\n", button); + "Beginning move/resize with button = %d", button); meta_display_begin_grab_op (window->display, window, op, @@ -3266,7 +3267,7 @@ meta_window_x11_client_message (MetaWindow *window, MetaClientType source_indication; guint32 timestamp; - meta_verbose ("_NET_ACTIVE_WINDOW request for window '%s', activating\n", + meta_verbose ("_NET_ACTIVE_WINDOW request for window '%s', activating", window->desc); source_indication = event->xclient.data.l[0]; @@ -3279,7 +3280,7 @@ meta_window_x11_client_message (MetaWindow *window, { /* Client using older EWMH _NET_ACTIVE_WINDOW without a timestamp */ meta_warning ("Buggy client sent a _NET_ACTIVE_WINDOW message with a " - "timestamp of 0 for %s\n", + "timestamp of 0 for %s", window->desc); timestamp = meta_display_get_current_time (display); } @@ -3292,7 +3293,7 @@ meta_window_x11_client_message (MetaWindow *window, { MetaLogicalMonitor *top, *bottom, *left, *right; - meta_verbose ("_NET_WM_FULLSCREEN_MONITORS request for window '%s'\n", + meta_verbose ("_NET_WM_FULLSCREEN_MONITORS request for window '%s'", window->desc); top = @@ -3519,11 +3520,11 @@ meta_window_x11_new (MetaDisplay *display, MetaWindow *window = NULL; gulong event_mask; - meta_verbose ("Attempting to manage 0x%lx\n", xwindow); + meta_verbose ("Attempting to manage 0x%lx", xwindow); if (meta_x11_display_xwindow_is_a_no_focus_window (x11_display, xwindow)) { - meta_verbose ("Not managing no_focus_window 0x%lx\n", + meta_verbose ("Not managing no_focus_window 0x%lx", xwindow); return NULL; } @@ -3539,32 +3540,32 @@ meta_window_x11_new (MetaDisplay *display, if (!XGetWindowAttributes (x11_display->xdisplay, xwindow, &attrs)) { - meta_verbose ("Failed to get attributes for window 0x%lx\n", + meta_verbose ("Failed to get attributes for window 0x%lx", xwindow); goto error; } if (attrs.root != x11_display->xroot) { - meta_verbose ("Not on our screen\n"); + meta_verbose ("Not on our screen"); goto error; } if (attrs.class == InputOnly) { - meta_verbose ("Not managing InputOnly windows\n"); + meta_verbose ("Not managing InputOnly windows"); goto error; } if (is_our_xwindow (x11_display, xwindow, &attrs)) { - meta_verbose ("Not managing our own windows\n"); + meta_verbose ("Not managing our own windows"); goto error; } if (maybe_filter_xwindow (display, xwindow, must_be_viewable, &attrs)) { - meta_verbose ("Not managing filtered window\n"); + meta_verbose ("Not managing filtered window"); goto error; } @@ -3581,12 +3582,13 @@ meta_window_x11_new (MetaDisplay *display, &state) && (state == IconicState || state == NormalState))) { - meta_verbose ("Deciding not to manage unmapped or unviewable window 0x%lx\n", xwindow); + meta_verbose ("Deciding not to manage unmapped or unviewable window 0x%lx", + xwindow); goto error; } existing_wm_state = state; - meta_verbose ("WM_STATE of %lx = %s\n", xwindow, + meta_verbose ("WM_STATE of %lx = %s", xwindow, wm_state_to_string (existing_wm_state)); } @@ -3645,7 +3647,7 @@ meta_window_x11_new (MetaDisplay *display, if (meta_x11_error_trap_pop_with_return (x11_display) != Success) { - meta_verbose ("Window 0x%lx disappeared just as we tried to manage it\n", + meta_verbose ("Window 0x%lx disappeared just as we tried to manage it", xwindow); goto error; } @@ -3733,7 +3735,7 @@ meta_window_x11_recalc_window_type (MetaWindow *window) priv->type_atom); meta_x11_error_trap_pop (x11_display); - meta_warning ("Unrecognized type atom [%s] set for %s \n", + meta_warning ("Unrecognized type atom [%s] set for %s ", atom_name ? atom_name : "unknown", window->desc); @@ -3786,7 +3788,7 @@ meta_window_x11_recalc_window_type (MetaWindow *window) } } - meta_verbose ("Calculated type %u for %s, old type %u\n", + meta_verbose ("Calculated type %u for %s, old type %u", type, window->desc, type); meta_window_set_type (window, type); } @@ -3826,7 +3828,7 @@ meta_window_x11_configure_notify (MetaWindow *window, meta_display_queue_check_fullscreen (window->display); if (!event->override_redirect && !event->send_event) - meta_warning ("Unhandled change of windows override redirect status\n"); + meta_warning ("Unhandled change of windows override redirect status"); meta_compositor_sync_window_geometry (window->display->compositor, window, FALSE); } @@ -3892,7 +3894,7 @@ meta_window_x11_set_allowed_actions_hint (MetaWindow *window) g_assert (i <= MAX_N_ACTIONS); - meta_verbose ("Setting _NET_WM_ALLOWED_ACTIONS with %d atoms\n", i); + meta_verbose ("Setting _NET_WM_ALLOWED_ACTIONS with %d atoms", i); meta_x11_error_trap_push (x11_display); XChangeProperty (x11_display->xdisplay, window->xwindow, @@ -4019,7 +4021,7 @@ meta_window_x11_update_sync_request_counter (MetaWindow *window, new_counter_value % 2 == 0)) { meta_topic (META_DEBUG_RESIZING, - "Alarm event received last motion x = %d y = %d\n", + "Alarm event received last motion x = %d y = %d", window->display->grab_latest_motion_x, window->display->grab_latest_motion_y); diff --git a/src/x11/xprops.c b/src/x11/xprops.c index cbf5a0604..ad7453853 100644 --- a/src/x11/xprops.c +++ b/src/x11/xprops.c @@ -156,7 +156,7 @@ validate_or_free_results (GetPropertyResults *results, if (res_name == NULL) res_name = "unknown"; - meta_warning ("Window 0x%lx has property %s\nthat was expected to have type %s format %d\nand actually has type %s format %d n_items %d.\nThis is most likely an application bug, not a window manager bug.\nThe window has title=\"%s\" class=\"%s\" name=\"%s\"\n", + meta_warning ("Window 0x%lx has property %s that was expected to have type %s format %d and actually has type %s format %d n_items %d. This is most likely an application bug, not a window manager bug. The window has title=\"%s\" class=\"%s\" name=\"%s\"", results->xwindow, prop_name ? prop_name : "(bad atom)", expected_name ? expected_name : "(bad atom)", @@ -305,7 +305,7 @@ motif_hints_from_results (GetPropertyResults *results, { g_free (results->prop); results->prop = NULL; - meta_verbose ("Motif hints had unexpected type or n_items\n"); + meta_verbose ("Motif hints had unexpected type or n_items"); return FALSE; } @@ -390,7 +390,7 @@ utf8_string_from_results (GetPropertyResults *results, char *name; name = XGetAtomName (results->x11_display->xdisplay, results->xatom); - meta_warning ("Property %s on window 0x%lx contained invalid UTF-8\n", + meta_warning ("Property %s on window 0x%lx contained invalid UTF-8", name, results->xwindow); meta_XFree (name); g_free (results->prop); @@ -457,7 +457,7 @@ utf8_list_from_results (GetPropertyResults *results, meta_x11_error_trap_push (results->x11_display); name = XGetAtomName (results->x11_display->xdisplay, results->xatom); meta_x11_error_trap_pop (results->x11_display); - meta_warning ("Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n", + meta_warning ("Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list", name, results->xwindow, i); meta_XFree (name); g_free (results->prop); @@ -685,7 +685,7 @@ wm_hints_from_results (GetPropertyResults *results, /* pre-R3 bogusly truncated window_group, don't fail on them */ if (results->n_items < (NumPropWMHintsElements - 1)) { - meta_verbose ("WM_HINTS property too short: %d should be %d\n", + meta_verbose ("WM_HINTS property too short: %d should be %d", (int) results->n_items, NumPropWMHintsElements - 1); if (results->prop) { @@ -837,7 +837,7 @@ meta_prop_get_values (MetaX11Display *x11_display, xcb_get_property_cookie_t *tasks; xcb_connection_t *xcb_conn = XGetXCBConnection (x11_display->xdisplay); - meta_verbose ("Requesting %d properties of 0x%lx at once\n", + meta_verbose ("Requesting %d properties of 0x%lx at once", n_values, xwindow); if (n_values == 0) @@ -860,7 +860,7 @@ meta_prop_get_values (MetaX11Display *x11_display, * property notify on an atom we don't care about. */ if (values[i].atom != None) - meta_bug ("META_PROP_VALUE_INVALID requested in %s\n", G_STRFUNC); + meta_bug ("META_PROP_VALUE_INVALID requested in %s", G_STRFUNC); break; case META_PROP_VALUE_UTF8_LIST: case META_PROP_VALUE_UTF8: @@ -908,7 +908,7 @@ meta_prop_get_values (MetaX11Display *x11_display, } /* Get replies for all our tasks */ - meta_topic (META_DEBUG_SYNC, "Syncing to get %d GetProperty replies in %s\n", + meta_topic (META_DEBUG_SYNC, "Syncing to get %d GetProperty replies in %s", n_values, G_STRFUNC); XSync (x11_display->xdisplay, False); |