From 37e4d38ca3a61eb843d80732a26f29668352433d Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 4 Aug 2020 15:53:16 +0200 Subject: Remove multiple empty lines find . \( -name '*.h' -o -name '*.c' \) -exec sed -i 'N;/^\n$/D;P;D;' {} \; --- src/core/async-getprop.h | 3 --- src/core/boxes.c | 2 -- src/core/constraints.c | 2 -- src/core/delete.c | 1 - src/core/display-private.h | 1 - src/core/display.c | 4 ---- src/core/effects.c | 2 -- src/core/frame-private.h | 3 --- src/core/frame.c | 2 -- src/core/group-private.h | 3 --- src/core/group-props.c | 2 -- src/core/group.h | 3 --- src/core/iconcache.h | 3 --- src/core/keybindings.c | 13 ------------- src/core/keybindings.h | 4 ---- src/core/main.c | 1 - src/core/marco-Xatomtype.h | 3 --- src/core/prefs.c | 3 --- src/core/screen-private.h | 1 - src/core/screen.c | 7 ------- src/core/session.c | 3 --- src/core/session.h | 4 ---- src/core/testasyncgetprop.c | 1 - src/core/util.c | 1 - src/core/window-private.h | 3 --- src/core/window-props.c | 2 -- src/core/window-props.h | 1 - src/core/window.c | 14 -------------- src/core/workspace.c | 1 - src/core/workspace.h | 4 ---- src/core/xprops.c | 1 - 31 files changed, 98 deletions(-) (limited to 'src/core') diff --git a/src/core/async-getprop.h b/src/core/async-getprop.h index b975d0f0..f222cf03 100644 --- a/src/core/async-getprop.h +++ b/src/core/async-getprop.h @@ -62,6 +62,3 @@ void* ag_Xmalloc0 (unsigned long bytes); #endif - - - diff --git a/src/core/boxes.c b/src/core/boxes.c index e05924e6..49c82ccc 100644 --- a/src/core/boxes.c +++ b/src/core/boxes.c @@ -721,7 +721,6 @@ meta_rectangle_expand_to_avoiding_struts (MetaRectangle *rect, rect->height = expand_to->height; } - /* Run over all struts */ for (strut_iter = all_struts; strut_iter; strut_iter = strut_iter->next) { @@ -818,7 +817,6 @@ meta_rectangle_overlaps_with_region (const GList *spanning_rects, return overlaps; } - void meta_rectangle_clamp_to_fit_into_region (const GList *spanning_rects, FixedDirections fixed_directions, diff --git a/src/core/constraints.c b/src/core/constraints.c index 99b4077e..90b5be15 100644 --- a/src/core/constraints.c +++ b/src/core/constraints.c @@ -449,7 +449,6 @@ setup_constraint_info (ConstraintInfo *info, meta_workspace_get_onxinerama_region (cur_workspace, xinerama_info->number); - /* Log all this information for debugging */ meta_topic (META_DEBUG_GEOMETRY, "Setting up constraint info:\n" @@ -522,7 +521,6 @@ place_window_if_needed(MetaWindow *window, meta_workspace_get_onxinerama_region (cur_workspace, xinerama_info->number); - info->current.x = placed_rect.x; info->current.y = placed_rect.y; diff --git a/src/core/delete.c b/src/core/delete.c index 056f76be..63f0d2f8 100644 --- a/src/core/delete.c +++ b/src/core/delete.c @@ -148,7 +148,6 @@ meta_window_delete (MetaWindow *window, window); } - void meta_window_kill (MetaWindow *window) { diff --git a/src/core/display-private.h b/src/core/display-private.h index 3352fb72..0352c2ad 100644 --- a/src/core/display-private.h +++ b/src/core/display-private.h @@ -55,7 +55,6 @@ typedef struct MetaEdgeResistanceData MetaEdgeResistanceData; typedef void (*MetaWindowPingFunc) (MetaDisplay* display, Window xwindow, guint32 timestamp, gpointer user_data); - #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ #define _NET_WM_STATE_ADD 1 /* add/set property */ #define _NET_WM_STATE_TOGGLE 2 /* toggle property */ diff --git a/src/core/display.c b/src/core/display.c index 85f43684..d9400d39 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -233,7 +233,6 @@ remove_pending_pings_for_window (MetaDisplay *display, Window xwindow) g_slist_free (dead); } - #ifdef HAVE_STARTUP_NOTIFICATION static void sn_error_trap_push (SnDisplay *sn_display, @@ -507,7 +506,6 @@ meta_display_open (void) meta_verbose ("Not compiled with Xsync support\n"); #endif /* !HAVE_XSYNC */ - #ifdef HAVE_SHAPE { the_display->have_shape = FALSE; @@ -1722,7 +1720,6 @@ static gboolean event_callback(XEvent* event, gpointer data) window = NULL; } - frame_was_receiver = FALSE; if (window && window->frame && @@ -5098,7 +5095,6 @@ process_selection_clear (MetaDisplay *display, event->xselectionclear.window, event->xselectionclear.selection); - if (screen != NULL) { meta_verbose ("Got selection clear for screen %d on display %s\n", diff --git a/src/core/effects.c b/src/core/effects.c index f23c60f2..6c0f7fdd 100644 --- a/src/core/effects.c +++ b/src/core/effects.c @@ -257,7 +257,6 @@ meta_effect_run_close (MetaWindow *window, run_handler (effect); } - /* old ugly minimization effect */ #ifdef HAVE_SHAPE @@ -576,7 +575,6 @@ draw_xor_rect (MetaScreen *screen, box_width = text_width + 2 * LINE_WIDTH; box_height = text_height + 2 * LINE_WIDTH; - box_x = shrunk_rect.x + (shrunk_rect.width - box_width) / 2; box_y = shrunk_rect.y + (shrunk_rect.height - box_height) / 2; diff --git a/src/core/frame-private.h b/src/core/frame-private.h index 811ac624..8c2a2eeb 100644 --- a/src/core/frame-private.h +++ b/src/core/frame-private.h @@ -77,6 +77,3 @@ void meta_frame_set_screen_cursor (MetaFrame *frame, #endif - - - diff --git a/src/core/frame.c b/src/core/frame.c index 86b78f1f..957f6c76 100644 --- a/src/core/frame.c +++ b/src/core/frame.c @@ -90,7 +90,6 @@ meta_window_ensure_frame (MetaWindow *window) frame->rect.x, frame->rect.y, frame->rect.width, frame->rect.height); - frame->xwindow = meta_ui_create_frame_window (window->screen->ui, window->display->xdisplay, window->xvisual, @@ -230,7 +229,6 @@ meta_window_destroy_frame (MetaWindow *window) meta_window_queue (window, META_QUEUE_MOVE_RESIZE); } - MetaFrameFlags meta_frame_get_flags (MetaFrame *frame) { diff --git a/src/core/group-private.h b/src/core/group-private.h index 88cd0f8b..03c42324 100644 --- a/src/core/group-private.h +++ b/src/core/group-private.h @@ -38,6 +38,3 @@ struct _MetaGroup #endif - - - diff --git a/src/core/group-props.c b/src/core/group-props.c index 23d10b88..1f25ba11 100644 --- a/src/core/group-props.c +++ b/src/core/group-props.c @@ -48,8 +48,6 @@ static void reload_prop_value (MetaGroup *group, static MetaGroupPropHooks* find_hooks (MetaDisplay *display, Atom property); - - void meta_group_reload_property (MetaGroup *group, Atom property) diff --git a/src/core/group.h b/src/core/group.h index 3ae06442..05df653f 100644 --- a/src/core/group.h +++ b/src/core/group.h @@ -48,6 +48,3 @@ gboolean meta_group_property_notify (MetaGroup *group, #endif - - - diff --git a/src/core/iconcache.h b/src/core/iconcache.h index 4614da02..d46abda0 100644 --- a/src/core/iconcache.h +++ b/src/core/iconcache.h @@ -79,6 +79,3 @@ gboolean meta_read_icons (MetaScreen *screen, #endif - - - diff --git a/src/core/keybindings.c b/src/core/keybindings.c index d37ec2cf..1ee36b5e 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -307,7 +307,6 @@ reload_modifiers (MetaDisplay *display) } } - static int count_bindings (const MetaKeyPref *prefs, int n_prefs) @@ -553,7 +552,6 @@ meta_display_process_mapping_event (MetaDisplay *display, * even when only the keymap changes */ reload_modmap (display); - if (keymap_changed) reload_keycodes (display); @@ -584,7 +582,6 @@ bindings_changed_callback (MetaPreference pref, } } - void meta_display_init_keys (MetaDisplay *display) { @@ -2460,7 +2457,6 @@ meta_spawn_command_line_async_on_screen (const gchar *command_line, return retval; } - static void handle_run_command (MetaDisplay *display, MetaScreen *screen, @@ -2499,7 +2495,6 @@ handle_run_command (MetaDisplay *display, } } - static void handle_maximize_vertically (MetaDisplay *display, MetaScreen *screen, @@ -2698,7 +2693,6 @@ handle_move_to_center (MetaDisplay *display, window->rect.height); } - static void handle_move_to_monitor (MetaDisplay *display, MetaScreen *screen, @@ -2754,7 +2748,6 @@ process_workspace_switch_grab (MetaDisplay *display, "Ending grab so we can focus on the target workspace\n"); meta_display_end_grab_op (display, event->xkey.time); - if(display->grab_op == META_GRAB_OP_KEYBOARD_WORKSPACE_SWITCHING) { meta_topic (META_DEBUG_KEYBINDINGS, @@ -2847,8 +2840,6 @@ process_workspace_switch_grab (MetaDisplay *display, event->xkey.time); } - - return TRUE; /* we already ended the grab */ } } @@ -3126,7 +3117,6 @@ handle_cycle (MetaDisplay *display, backwards, FALSE); } - static void handle_toggle_fullscreen (MetaDisplay *display, MetaScreen *screen, @@ -3632,7 +3622,6 @@ handle_rename_workspace_callback(GIOChannel *ioc, GIOCondition cond, gpointer da return FALSE; } - if (cond & G_IO_ERR ) { meta_warning ("handle_rename_workspace_callback: error. G_IO_ERR.\n"); @@ -3649,7 +3638,6 @@ handle_rename_workspace_callback(GIOChannel *ioc, GIOCondition cond, gpointer da return FALSE; } - meta_topic (META_DEBUG_KEYBINDINGS, "handle_rename_workspace_callback: workspace_index=%d\n", *workspace_index); if (*workspace_index < 0 || *workspace_index > 36) { @@ -3659,7 +3647,6 @@ handle_rename_workspace_callback(GIOChannel *ioc, GIOCondition cond, gpointer da return FALSE; } - if (cond & (!G_IO_IN & !G_IO_PRI)) { meta_warning ("handle_rename_workspace_callback: unknown error\n"); diff --git a/src/core/keybindings.h b/src/core/keybindings.h index d5ea1afa..705678bc 100644 --- a/src/core/keybindings.h +++ b/src/core/keybindings.h @@ -41,7 +41,6 @@ #define ARROW_DOWN 116 #define ARROW_DOWN_PAD 88 - #include "display-private.h" #include "window.h" @@ -68,6 +67,3 @@ void meta_display_process_mapping_event (MetaDisplay *display, #endif - - - diff --git a/src/core/main.c b/src/core/main.c index 72542bff..19b67aff 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -489,7 +489,6 @@ main (int argc, char **argv) meta_prefs_init (); meta_prefs_add_listener (prefs_changed_callback, NULL); - #if 1 for (i=0; ikey!=NULL) { gint value; @@ -809,7 +808,6 @@ handle_preference_update_int (const gchar *key, GSettings *settings) } - /****************************************************************************/ /* Listeners. */ /****************************************************************************/ @@ -925,7 +923,6 @@ queue_changed (MetaPreference pref) changed_idle_handler, NULL, NULL); } - /****************************************************************************/ /* Initialisation. */ /****************************************************************************/ diff --git a/src/core/screen-private.h b/src/core/screen-private.h index c1552ab0..56755f9a 100644 --- a/src/core/screen-private.h +++ b/src/core/screen-private.h @@ -181,7 +181,6 @@ const MetaXineramaScreenInfo* meta_screen_get_xinerama_for_rect (MetaScreen const MetaXineramaScreenInfo* meta_screen_get_xinerama_for_window (MetaScreen *screen, MetaWindow *window); - const MetaXineramaScreenInfo* meta_screen_get_xinerama_neighbor (MetaScreen *screen, int which_xinerama, MetaScreenDirection dir); diff --git a/src/core/screen.c b/src/core/screen.c index cdf08bfd..efb65945 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -283,7 +283,6 @@ reload_xinerama_infos (MetaScreen *screen) "Marco compiled without Solaris Xinerama support\n"); #endif /* HAVE_SOLARIS_XINERAMA */ - /* If no Xinerama, fill in the single screen info so * we can use the field unconditionally */ @@ -685,7 +684,6 @@ meta_screen_free (MetaScreen *screen, if (screen->work_area_idle != 0) g_source_remove (screen->work_area_idle); - if (XGetGCValues (screen->display->xdisplay, screen->root_xor_gc, GCFont, @@ -881,7 +879,6 @@ prefs_changed_callback (MetaPreference pref, } } - static char* get_screen_name (MetaDisplay *display, int number) @@ -2104,7 +2101,6 @@ meta_screen_queue_workarea_recalc (MetaScreen *screen) } } - #ifdef WITH_VERBOSE_MODE static char * meta_screen_corner_to_string (MetaScreenCorner corner) @@ -2195,7 +2191,6 @@ meta_screen_calc_workspace_layout (MetaScreen *screen, * in the above grids could be missing */ - grid = g_new (int, grid_area); i = 0; @@ -2522,7 +2517,6 @@ meta_screen_show_desktop (MetaScreen *screen, windows = windows->next; } - meta_screen_update_showing_desktop_hint (screen); } @@ -2539,7 +2533,6 @@ meta_screen_unshow_desktop (MetaScreen *screen) meta_screen_update_showing_desktop_hint (screen); } - #ifdef HAVE_STARTUP_NOTIFICATION static gboolean startup_sequence_timeout (void *data); diff --git a/src/core/session.c b/src/core/session.c index ec1d3a71..5cd13b31 100644 --- a/src/core/session.c +++ b/src/core/session.c @@ -540,7 +540,6 @@ save_yourself_callback (SmcConn smc_conn, save_yourself_possibly_done (shutdown, successful); } - static void die_callback (SmcConn smc_conn, SmPointer client_data) { @@ -663,7 +662,6 @@ set_clone_restart_commands (void) } prop3.num_vals = i; - props[0] = &prop1; props[1] = &prop2; props[2] = &prop3; @@ -1120,7 +1118,6 @@ load_state (const char *previous_save_file) &error)) goto error; - error = NULL; if (!g_markup_parse_context_end_parse (context, &error)) goto error; diff --git a/src/core/session.h b/src/core/session.h index 635cf3fb..9675c339 100644 --- a/src/core/session.h +++ b/src/core/session.h @@ -81,11 +81,7 @@ void meta_window_release_saved_state (const MetaWindowSe void meta_session_init (const char *client_id, const char *save_file); - void meta_session_shutdown (void); #endif - - - diff --git a/src/core/testasyncgetprop.c b/src/core/testasyncgetprop.c index 78ccede9..f1d3a65c 100644 --- a/src/core/testasyncgetprop.c +++ b/src/core/testasyncgetprop.c @@ -170,7 +170,6 @@ atom_name (Display *display, } } - #define ELAPSED(start_time, current_time) \ (((((double)current_time.tv_sec - start_time.tv_sec) * 1000000 + \ (current_time.tv_usec - start_time.tv_usec))) / 1000.0) diff --git a/src/core/util.c b/src/core/util.c index 9e15bb26..c29901de 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -678,7 +678,6 @@ meta_show_entry_dialog(const char *message, } argvl[i] = NULL; - unsetenv ("WINDOWID"); /* start in current workspace */ g_spawn_async_with_pipes ( "/", diff --git a/src/core/window-private.h b/src/core/window-private.h index ca631966..e641e42a 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -512,7 +512,6 @@ void meta_window_resize_with_gravity (MetaWindow *window, int h, int gravity); - /* Return whether the window would be showing if we were on its workspace */ gboolean meta_window_showing_on_its_workspace (MetaWindow *window); @@ -582,7 +581,6 @@ void meta_window_send_icccm_message (MetaWindow *window, Atom atom, guint32 timestamp); - void meta_window_move_resize_request(MetaWindow *window, guint value_mask, int gravity, @@ -663,7 +661,6 @@ void meta_window_foreach_ancestor (MetaWindow *window, void *data); MetaWindow* meta_window_find_root_ancestor (MetaWindow *window); - void meta_window_begin_grab_op (MetaWindow *window, MetaGrabOp op, gboolean frame_action, diff --git a/src/core/window-props.c b/src/core/window-props.c index 54a2ecee..f0eb1c64 100644 --- a/src/core/window-props.c +++ b/src/core/window-props.c @@ -76,7 +76,6 @@ typedef struct MetaWindowPropHooks static MetaWindowPropHooks* find_hooks (MetaDisplay *display, Atom property); - void meta_window_reload_property (MetaWindow *window, Atom property, @@ -345,7 +344,6 @@ reload_net_wm_user_time_window (MetaWindow *window, NoEventMask); } - /* Obtain the new NET_WM_USER_TIME_WINDOW and register it */ window->user_time_window = value->v.xwindow; if (window->user_time_window != None) diff --git a/src/core/window-props.h b/src/core/window-props.h index 4d6840f7..9493d230 100644 --- a/src/core/window-props.h +++ b/src/core/window-props.h @@ -46,7 +46,6 @@ void meta_window_reload_property (MetaWindow *window, Atom property, gboolean initial); - /** * Requests the current values of a set of properties for a given * window from the server, and deals with them appropriately. diff --git a/src/core/window.c b/src/core/window.c index b86e6232..55594fe3 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -56,7 +56,6 @@ static int destroying_windows_disallowed = 0; - static void update_sm_hints (MetaWindow *window); static void update_net_frame_extents (MetaWindow *window); static void recalc_window_type (MetaWindow *window); @@ -91,7 +90,6 @@ static void meta_window_move_resize_internal (MetaWindow *window, static void ensure_mru_position_after (MetaWindow *window, MetaWindow *after_this_one); - static void meta_window_move_resize_now (MetaWindow *window); static void meta_window_unqueue (MetaWindow *window, guint queuebits); @@ -118,10 +116,8 @@ static void meta_window_transform_to_monitor (MetaRectangle *target_rect const MetaRectangle *from_monitor, const MetaRectangle *to_monitor); - static gboolean update_resize_timeout (gpointer data); - static void meta_window_flush_calc_showing (MetaWindow *window); static gboolean queue_calc_showing_func (MetaWindow *window, @@ -245,7 +241,6 @@ meta_window_new (MetaDisplay *display, return NULL; } - meta_error_trap_pop (display, FALSE); meta_display_ungrab (display); @@ -590,7 +585,6 @@ meta_window_new_with_attrs (MetaDisplay *display, meta_display_register_x_window (display, &window->xwindow, window); - /* assign the window to its group, or create a new group if needed */ window->group = NULL; @@ -1180,7 +1174,6 @@ meta_window_free (MetaWindow *window, meta_display_unregister_x_window (window->display, window->xwindow); - meta_error_trap_push (window->display); /* Put back anything we messed up */ @@ -2743,7 +2736,6 @@ meta_window_tile (MetaWindow *window) else meta_window_save_rect(window); - window->tiled = TRUE; /* move_resize with new tiling constraints */ @@ -2885,7 +2877,6 @@ meta_window_unmaximize (MetaWindow *window, meta_compositor_unmaximize_window (window->display->compositor, window); } - void meta_window_move_to_monitor(MetaWindow *window, const MetaXineramaScreenInfo *from_monitor, @@ -2946,8 +2937,6 @@ static void meta_window_transform_to_monitor(MetaRectangle *target_rect, } - - void meta_window_make_above (MetaWindow *window) { @@ -7465,7 +7454,6 @@ update_move (MetaWindow *window, new_y = old.y; } - /* Do any edge resistance/snapping */ meta_window_edge_resistance_for_move (window, old.x, @@ -7493,7 +7481,6 @@ update_move (MetaWindow *window, meta_window_move (window, TRUE, new_x, new_y); } - static MetaTileMode calculate_tiling_mode(int x, int y, MetaWindow *window, @@ -7535,7 +7522,6 @@ static MetaTileMode calculate_tiling_mode(int x, } - static gboolean update_resize_timeout (gpointer data) { diff --git a/src/core/workspace.c b/src/core/workspace.c index e2960a41..620184f9 100644 --- a/src/core/workspace.c +++ b/src/core/workspace.c @@ -968,7 +968,6 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace, "focus window may not be correct.\n"); } - if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK || !workspace->screen->display->mouse_mode) focus_ancestor_or_top_window (workspace, not_this_one, timestamp); diff --git a/src/core/workspace.h b/src/core/workspace.h index 3af1997d..4ad4e4a1 100644 --- a/src/core/workspace.h +++ b/src/core/workspace.h @@ -97,7 +97,6 @@ GList* meta_workspace_list_windows (MetaWorkspace *workspace); void meta_workspace_invalidate_work_area (MetaWorkspace *workspace); - void meta_workspace_get_work_area_for_xinerama (MetaWorkspace *workspace, int which_xinerama, MetaRectangle *area); @@ -118,6 +117,3 @@ const char* meta_workspace_get_name (MetaWorkspace *workspace); #endif - - - diff --git a/src/core/xprops.c b/src/core/xprops.c index bd374195..5cc9b451 100644 --- a/src/core/xprops.c +++ b/src/core/xprops.c @@ -79,7 +79,6 @@ from The Open Group. */ - #include #include "xprops.h" #include "errors.h" -- cgit v1.2.1