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

frames: Move overrides and class functions after helpers

Browse Source 
This is in preparation of calling helper functions from class overrides
in a later commit and also brings things more in line with the mutter
coding style.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3611>
This commit is contained in:
Sebastian Keller 2024-02-21 23:12:52 +01:00 committed by Marge Bot
parent 9bac742ba5
commit f47b816037
1 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/frames/meta-frame.c
View File

@ -60,49 +60,6 @@ typedef struct
G_DEFINE_TYPE (MetaFrame, meta_frame, GTK_TYPE_WINDOW) G_DEFINE_TYPE (MetaFrame, meta_frame, GTK_TYPE_WINDOW)
static void
meta_frame_constructed (GObject *object)
{
MetaFrame *frame = META_FRAME (object);
GdkDisplay *display;
display = gtk_widget_get_display (GTK_WIDGET (object));
frame->atom__NET_WM_VISIBLE_NAME =
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_VISIBLE_NAME");
frame->atom__NET_WM_NAME =
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME");
frame->atom__MOTIF_WM_HINTS =
gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_WM_HINTS");
frame->atom__NET_WM_STATE =
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE");
frame->atom__NET_WM_STATE_FULLSCREEN =
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE_FULLSCREEN");
G_OBJECT_CLASS (meta_frame_parent_class)->constructed (object);
}
static void
meta_frame_finalize (GObject *object)
{
MetaFrame *frame = META_FRAME (object);
g_free (frame->net_wm_visible_name);
g_free (frame->net_wm_name);
g_free (frame->wm_name);
G_OBJECT_CLASS (meta_frame_parent_class)->finalize (object);
}
static void
meta_frame_class_init (MetaFrameClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->constructed = meta_frame_constructed;
object_class->finalize = meta_frame_finalize;
}
static gboolean static gboolean
client_window_has_wm_protocol (MetaFrame *frame, client_window_has_wm_protocol (MetaFrame *frame,
Window client_window, Window client_window,
@ -198,13 +155,6 @@ on_frame_close_request (GtkWindow *window,
return TRUE; return TRUE;
} }
static void
meta_frame_init (MetaFrame *frame)
{
g_signal_connect (frame, "close-request",
G_CALLBACK (on_frame_close_request), NULL);
}
static void static void
meta_frame_update_extents (MetaFrame *frame, meta_frame_update_extents (MetaFrame *frame,
GtkBorder border) GtkBorder border)
@ -500,6 +450,56 @@ frame_sync_wm_state (MetaFrame *frame,
XFree (data); XFree (data);
} }
static void
meta_frame_constructed (GObject *object)
{
MetaFrame *frame = META_FRAME (object);
GdkDisplay *display;
display = gtk_widget_get_display (GTK_WIDGET (object));
frame->atom__NET_WM_VISIBLE_NAME =
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_VISIBLE_NAME");
frame->atom__NET_WM_NAME =
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_NAME");
frame->atom__MOTIF_WM_HINTS =
gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_WM_HINTS");
frame->atom__NET_WM_STATE =
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE");
frame->atom__NET_WM_STATE_FULLSCREEN =
gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_STATE_FULLSCREEN");
G_OBJECT_CLASS (meta_frame_parent_class)->constructed (object);
}
static void
meta_frame_finalize (GObject *object)
{
MetaFrame *frame = META_FRAME (object);
g_free (frame->net_wm_visible_name);
g_free (frame->net_wm_name);
g_free (frame->wm_name);
G_OBJECT_CLASS (meta_frame_parent_class)->finalize (object);
}
static void
meta_frame_class_init (MetaFrameClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->constructed = meta_frame_constructed;
object_class->finalize = meta_frame_finalize;
}
static void
meta_frame_init (MetaFrame *frame)
{
g_signal_connect (frame, "close-request",
G_CALLBACK (on_frame_close_request), NULL);
}
GtkWidget * GtkWidget *
meta_frame_new (Window window) meta_frame_new (Window window)
{ {