summaryrefslogtreecommitdiff
path: root/plugins/common
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-02-22 03:44:27 -0800
committerStefano Karapetsas <[email protected]>2012-02-22 03:44:27 -0800
commit2dfe3164d9f195b50e066def8e2a4782b5910c10 (patch)
treef95660c9462b74c2775355c29df79267fc30501b /plugins/common
parentecd8a153901507f5d210d6f85103693ef81d49c3 (diff)
parente46b4adef5c6c6805b3ca6dbfbe99a4299252514 (diff)
downloadmate-settings-daemon-2dfe3164d9f195b50e066def8e2a4782b5910c10.tar.bz2
mate-settings-daemon-2dfe3164d9f195b50e066def8e2a4782b5910c10.tar.xz
Merge pull request #3 from haxar/master
gsd to msd complete rename patch by NiceandGently
Diffstat (limited to 'plugins/common')
-rw-r--r--plugins/common/Makefile.am10
-rw-r--r--plugins/common/msd-keygrab.c (renamed from plugins/common/gsd-keygrab.c)24
-rw-r--r--plugins/common/msd-keygrab.h (renamed from plugins/common/gsd-keygrab.h)6
-rw-r--r--plugins/common/msd-osd-window.c (renamed from plugins/common/gsd-osd-window.c)128
-rw-r--r--plugins/common/msd-osd-window.h (renamed from plugins/common/gsd-osd-window.h)50
5 files changed, 109 insertions, 109 deletions
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index 447d02d..3733a90 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -4,10 +4,10 @@ noinst_LTLIBRARIES = libcommon.la
libcommon_la_SOURCES = \
eggaccelerators.c \
eggaccelerators.h \
- gsd-keygrab.c \
- gsd-keygrab.h \
- gsd-osd-window.c \
- gsd-osd-window.h
+ msd-keygrab.c \
+ msd-keygrab.h \
+ msd-osd-window.c \
+ msd-osd-window.h
libcommon_la_CPPFLAGS = \
$(AM_CPPFLAGS)
@@ -17,7 +17,7 @@ libcommon_la_CFLAGS = \
$(AM_CFLAGS)
libcommon_la_LDFLAGS = \
- $(GSD_PLUGIN_LDFLAGS) $(X11_LIBS)
+ $(MSD_PLUGIN_LDFLAGS) $(X11_LIBS)
libcommon_la_LIBADD = \
$(SETTINGS_PLUGIN_LIBS)
diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/msd-keygrab.c
index d94fd29..7a16f4e 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/msd-keygrab.c
@@ -32,25 +32,25 @@
#include "eggaccelerators.h"
-#include "gsd-keygrab.h"
+#include "msd-keygrab.h"
/* these are the mods whose combinations are ignored by the keygrabbing code */
-static GdkModifierType gsd_ignored_mods = 0;
+static GdkModifierType msd_ignored_mods = 0;
/* these are the ones we actually use for global keys, we always only check
* for these set */
-static GdkModifierType gsd_used_mods = 0;
+static GdkModifierType msd_used_mods = 0;
static void
setup_modifiers (void)
{
- if (gsd_used_mods == 0 || gsd_ignored_mods == 0) {
+ if (msd_used_mods == 0 || msd_ignored_mods == 0) {
GdkModifierType dynmods;
/* default modifiers */
- gsd_ignored_mods = \
+ msd_ignored_mods = \
0x2000 /*Xkb modifier*/ | GDK_LOCK_MASK | GDK_HYPER_MASK;
- gsd_used_mods = \
+ msd_used_mods = \
GDK_SHIFT_MASK | GDK_CONTROL_MASK |\
GDK_MOD1_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD4_MASK |\
GDK_MOD5_MASK | GDK_SUPER_MASK | GDK_META_MASK;
@@ -62,8 +62,8 @@ setup_modifiers (void)
EGG_VIRTUAL_NUM_LOCK_MASK,
&dynmods);
- gsd_ignored_mods |= dynmods;
- gsd_used_mods &= ~dynmods;
+ msd_ignored_mods |= dynmods;
+ msd_used_mods &= ~dynmods;
}
}
@@ -89,7 +89,7 @@ grab_key_real (guint keycode,
}
}
-/* Grab the key. In order to ignore GSD_IGNORED_MODS we need to grab
+/* Grab the key. In order to ignore MSD_IGNORED_MODS we need to grab
* all combinations of the ignored modifiers and those actually used
* for the binding (if any).
*
@@ -124,7 +124,7 @@ grab_key_unsafe (Key *key,
setup_modifiers ();
- mask = gsd_ignored_mods & ~key->state & GDK_MODIFIER_MASK;
+ mask = msd_ignored_mods & ~key->state & GDK_MODIFIER_MASK;
bit = 0;
/* store the indexes of all set bits in mask in the array */
@@ -236,11 +236,11 @@ match_key (Key *key, XEvent *event)
consumed &= ~GDK_SHIFT_MASK;
return ((lower == key->keysym || upper == key->keysym)
- && (event->xkey.state & ~consumed & gsd_used_mods) == key->state);
+ && (event->xkey.state & ~consumed & msd_used_mods) == key->state);
}
/* The key we passed doesn't have a keysym, so try with just the keycode */
return (key != NULL
- && key->state == (event->xkey.state & gsd_used_mods)
+ && key->state == (event->xkey.state & msd_used_mods)
&& key_uses_keycode (key, event->xkey.keycode));
}
diff --git a/plugins/common/gsd-keygrab.h b/plugins/common/msd-keygrab.h
index a157ab4..8ebef21 100644
--- a/plugins/common/gsd-keygrab.h
+++ b/plugins/common/msd-keygrab.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __GSD_COMMON_KEYGRAB_H
-#define __GSD_COMMON_KEYGRAB_H
+#ifndef __MSD_COMMON_KEYGRAB_H
+#define __MSD_COMMON_KEYGRAB_H
#ifdef __cplusplus
extern "C" {
@@ -48,4 +48,4 @@ gboolean key_uses_keycode (const Key *key,
}
#endif
-#endif /* __GSD_COMMON_KEYGRAB_H */
+#endif /* __MSD_COMMON_KEYGRAB_H */
diff --git a/plugins/common/gsd-osd-window.c b/plugins/common/msd-osd-window.c
index 03ca316..123313c 100644
--- a/plugins/common/gsd-osd-window.c
+++ b/plugins/common/msd-osd-window.c
@@ -36,7 +36,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "gsd-osd-window.h"
+#include "msd-osd-window.h"
#define DIALOG_TIMEOUT 2000 /* dialog timeout in ms */
#define DIALOG_FADE_TIMEOUT 1500 /* timeout before fade starts */
@@ -44,9 +44,9 @@
#define BG_ALPHA 0.75
-#define GSD_OSD_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_OSD_WINDOW, GsdOsdWindowPrivate))
+#define MSD_OSD_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MSD_TYPE_OSD_WINDOW, MsdOsdWindowPrivate))
-struct GsdOsdWindowPrivate
+struct MsdOsdWindowPrivate
{
guint is_composited : 1;
guint hide_timeout_id;
@@ -61,10 +61,10 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (GsdOsdWindow, gsd_osd_window, GTK_TYPE_WINDOW)
+G_DEFINE_TYPE (MsdOsdWindow, msd_osd_window, GTK_TYPE_WINDOW)
static gboolean
-fade_timeout (GsdOsdWindow *window)
+fade_timeout (MsdOsdWindow *window)
{
if (window->priv->fade_out_alpha <= 0.0) {
gtk_widget_hide (GTK_WIDGET (window));
@@ -95,7 +95,7 @@ fade_timeout (GsdOsdWindow *window)
}
static gboolean
-hide_timeout (GsdOsdWindow *window)
+hide_timeout (MsdOsdWindow *window)
{
if (window->priv->is_composited) {
window->priv->hide_timeout_id = 0;
@@ -110,7 +110,7 @@ hide_timeout (GsdOsdWindow *window)
}
static void
-remove_hide_timeout (GsdOsdWindow *window)
+remove_hide_timeout (MsdOsdWindow *window)
{
if (window->priv->hide_timeout_id != 0) {
g_source_remove (window->priv->hide_timeout_id);
@@ -125,7 +125,7 @@ remove_hide_timeout (GsdOsdWindow *window)
}
static void
-add_hide_timeout (GsdOsdWindow *window)
+add_hide_timeout (MsdOsdWindow *window)
{
int timeout;
@@ -140,7 +140,7 @@ add_hide_timeout (GsdOsdWindow *window)
}
void
-gsd_osd_window_draw_rounded_rectangle (cairo_t* cr,
+msd_osd_window_draw_rounded_rectangle (cairo_t* cr,
gdouble aspect,
gdouble x,
gdouble y,
@@ -192,7 +192,7 @@ gsd_osd_window_draw_rounded_rectangle (cairo_t* cr,
}
void
-gsd_osd_window_color_reverse (const GdkColor *a,
+msd_osd_window_color_reverse (const GdkColor *a,
GdkColor *b)
{
gdouble red;
@@ -228,7 +228,7 @@ gsd_osd_window_color_reverse (const GdkColor *a,
static void
expose_when_composited (GtkWidget *widget, GdkEventExpose *event)
{
- GsdOsdWindow *window;
+ MsdOsdWindow *window;
cairo_t *context;
cairo_t *cr;
cairo_surface_t *surface;
@@ -238,7 +238,7 @@ expose_when_composited (GtkWidget *widget, GdkEventExpose *event)
GdkColor color;
double r, g, b;
- window = GSD_OSD_WINDOW (widget);
+ window = MSD_OSD_WINDOW (widget);
context = gdk_cairo_create (gtk_widget_get_window (widget));
@@ -264,15 +264,15 @@ expose_when_composited (GtkWidget *widget, GdkEventExpose *event)
cairo_paint (cr);
/* draw a box */
- gsd_osd_window_draw_rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
- gsd_osd_window_color_reverse (&style->bg[GTK_STATE_NORMAL], &color);
+ msd_osd_window_draw_rounded_rectangle (cr, 1.0, 0.5, 0.5, height / 10, width-1, height-1);
+ msd_osd_window_color_reverse (&style->bg[GTK_STATE_NORMAL], &color);
r = (float)color.red / 65535.0;
g = (float)color.green / 65535.0;
b = (float)color.blue / 65535.0;
cairo_set_source_rgba (cr, r, g, b, BG_ALPHA);
cairo_fill_preserve (cr);
- gsd_osd_window_color_reverse (&style->text_aa[GTK_STATE_NORMAL], &color);
+ msd_osd_window_color_reverse (&style->text_aa[GTK_STATE_NORMAL], &color);
r = (float)color.red / 65535.0;
g = (float)color.green / 65535.0;
b = (float)color.blue / 65535.0;
@@ -308,10 +308,10 @@ expose_when_composited (GtkWidget *widget, GdkEventExpose *event)
static void
expose_when_not_composited (GtkWidget *widget, GdkEventExpose *event)
{
- GsdOsdWindow *window;
+ MsdOsdWindow *window;
GtkAllocation allocation;
- window = GSD_OSD_WINDOW (widget);
+ window = MSD_OSD_WINDOW (widget);
gtk_widget_get_allocation (widget, &allocation);
@@ -321,7 +321,7 @@ expose_when_not_composited (GtkWidget *widget, GdkEventExpose *event)
GTK_SHADOW_OUT,
&event->area,
widget,
- NULL, /* NULL detail -> themes should use the GsdOsdWindow widget name, probably */
+ NULL, /* NULL detail -> themes should use the MsdOsdWindow widget name, probably */
0,
0,
allocation.width,
@@ -329,13 +329,13 @@ expose_when_not_composited (GtkWidget *widget, GdkEventExpose *event)
}
static gboolean
-gsd_osd_window_expose_event (GtkWidget *widget,
+msd_osd_window_expose_event (GtkWidget *widget,
GdkEventExpose *event)
{
- GsdOsdWindow *window;
+ MsdOsdWindow *window;
GtkWidget *child;
- window = GSD_OSD_WINDOW (widget);
+ window = MSD_OSD_WINDOW (widget);
if (window->priv->is_composited)
expose_when_composited (widget, event);
@@ -350,34 +350,34 @@ gsd_osd_window_expose_event (GtkWidget *widget,
}
static void
-gsd_osd_window_real_show (GtkWidget *widget)
+msd_osd_window_real_show (GtkWidget *widget)
{
- GsdOsdWindow *window;
+ MsdOsdWindow *window;
- if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->show) {
- GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->show (widget);
+ if (GTK_WIDGET_CLASS (msd_osd_window_parent_class)->show) {
+ GTK_WIDGET_CLASS (msd_osd_window_parent_class)->show (widget);
}
- window = GSD_OSD_WINDOW (widget);
+ window = MSD_OSD_WINDOW (widget);
remove_hide_timeout (window);
add_hide_timeout (window);
}
static void
-gsd_osd_window_real_hide (GtkWidget *widget)
+msd_osd_window_real_hide (GtkWidget *widget)
{
- GsdOsdWindow *window;
+ MsdOsdWindow *window;
- if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->hide) {
- GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->hide (widget);
+ if (GTK_WIDGET_CLASS (msd_osd_window_parent_class)->hide) {
+ GTK_WIDGET_CLASS (msd_osd_window_parent_class)->hide (widget);
}
- window = GSD_OSD_WINDOW (widget);
+ window = MSD_OSD_WINDOW (widget);
remove_hide_timeout (window);
}
static void
-gsd_osd_window_real_realize (GtkWidget *widget)
+msd_osd_window_real_realize (GtkWidget *widget)
{
GdkColormap *colormap;
GtkAllocation allocation;
@@ -390,8 +390,8 @@ gsd_osd_window_real_realize (GtkWidget *widget)
gtk_widget_set_colormap (widget, colormap);
}
- if (GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->realize) {
- GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->realize (widget);
+ if (GTK_WIDGET_CLASS (msd_osd_window_parent_class)->realize) {
+ GTK_WIDGET_CLASS (msd_osd_window_parent_class)->realize (widget);
}
gtk_widget_get_allocation (widget, &allocation);
@@ -412,12 +412,12 @@ gsd_osd_window_real_realize (GtkWidget *widget)
}
static void
-gsd_osd_window_style_set (GtkWidget *widget,
+msd_osd_window_style_set (GtkWidget *widget,
GtkStyle *previous_style)
{
GtkStyle *style;
- GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->style_set (widget, previous_style);
+ GTK_WIDGET_CLASS (msd_osd_window_parent_class)->style_set (widget, previous_style);
/* We set our border width to 12 (per the MATE standard), plus the
* thickness of the frame that we draw in our expose handler. This will
@@ -429,14 +429,14 @@ gsd_osd_window_style_set (GtkWidget *widget,
}
static void
-gsd_osd_window_size_request (GtkWidget *widget,
+msd_osd_window_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkStyle *style;
- GTK_WIDGET_CLASS (gsd_osd_window_parent_class)->size_request (widget, requisition);
+ GTK_WIDGET_CLASS (msd_osd_window_parent_class)->size_request (widget, requisition);
- /* See the comment in gsd_osd_window_style_set() for why we add the thickness here */
+ /* See the comment in msd_osd_window_style_set() for why we add the thickness here */
style = gtk_widget_get_style (widget);
@@ -445,13 +445,13 @@ gsd_osd_window_size_request (GtkWidget *widget,
}
static GObject *
-gsd_osd_window_constructor (GType type,
+msd_osd_window_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params)
{
GObject *object;
- object = G_OBJECT_CLASS (gsd_osd_window_parent_class)->constructor (type, n_construct_properties, construct_params);
+ object = G_OBJECT_CLASS (msd_osd_window_parent_class)->constructor (type, n_construct_properties, construct_params);
g_object_set (object,
"type", GTK_WINDOW_POPUP,
@@ -465,64 +465,64 @@ gsd_osd_window_constructor (GType type,
}
static void
-gsd_osd_window_class_init (GsdOsdWindowClass *klass)
+msd_osd_window_class_init (MsdOsdWindowClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- gobject_class->constructor = gsd_osd_window_constructor;
+ gobject_class->constructor = msd_osd_window_constructor;
- widget_class->show = gsd_osd_window_real_show;
- widget_class->hide = gsd_osd_window_real_hide;
- widget_class->realize = gsd_osd_window_real_realize;
- widget_class->style_set = gsd_osd_window_style_set;
- widget_class->size_request = gsd_osd_window_size_request;
- widget_class->expose_event = gsd_osd_window_expose_event;
+ widget_class->show = msd_osd_window_real_show;
+ widget_class->hide = msd_osd_window_real_hide;
+ widget_class->realize = msd_osd_window_real_realize;
+ widget_class->style_set = msd_osd_window_style_set;
+ widget_class->size_request = msd_osd_window_size_request;
+ widget_class->expose_event = msd_osd_window_expose_event;
signals[EXPOSE_WHEN_COMPOSITED] = g_signal_new ("expose-when-composited",
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GsdOsdWindowClass, expose_when_composited),
+ G_STRUCT_OFFSET (MsdOsdWindowClass, expose_when_composited),
NULL, NULL,
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
- g_type_class_add_private (klass, sizeof (GsdOsdWindowPrivate));
+ g_type_class_add_private (klass, sizeof (MsdOsdWindowPrivate));
}
/**
- * gsd_osd_window_is_composited:
- * @window: a #GsdOsdWindow
+ * msd_osd_window_is_composited:
+ * @window: a #MsdOsdWindow
*
* Return value: whether the window was created on a composited screen.
*/
gboolean
-gsd_osd_window_is_composited (GsdOsdWindow *window)
+msd_osd_window_is_composited (MsdOsdWindow *window)
{
return window->priv->is_composited;
}
/**
- * gsd_osd_window_is_valid:
- * @window: a #GsdOsdWindow
+ * msd_osd_window_is_valid:
+ * @window: a #MsdOsdWindow
*
* Return value: TRUE if the @window's idea of being composited matches whether
* its current screen is actually composited.
*/
gboolean
-gsd_osd_window_is_valid (GsdOsdWindow *window)
+msd_osd_window_is_valid (MsdOsdWindow *window)
{
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window));
return gdk_screen_is_composited (screen) == window->priv->is_composited;
}
static void
-gsd_osd_window_init (GsdOsdWindow *window)
+msd_osd_window_init (MsdOsdWindow *window)
{
GdkScreen *screen;
- window->priv = GSD_OSD_WINDOW_GET_PRIVATE (window);
+ window->priv = MSD_OSD_WINDOW_GET_PRIVATE (window);
screen = gtk_widget_get_screen (GTK_WIDGET (window));
@@ -550,19 +550,19 @@ gsd_osd_window_init (GsdOsdWindow *window)
}
GtkWidget *
-gsd_osd_window_new (void)
+msd_osd_window_new (void)
{
- return g_object_new (GSD_TYPE_OSD_WINDOW, NULL);
+ return g_object_new (MSD_TYPE_OSD_WINDOW, NULL);
}
/**
- * gsd_osd_window_update_and_hide:
- * @window: a #GsdOsdWindow
+ * msd_osd_window_update_and_hide:
+ * @window: a #MsdOsdWindow
*
* Queues the @window for immediate drawing, and queues a timer to hide the window.
*/
void
-gsd_osd_window_update_and_hide (GsdOsdWindow *window)
+msd_osd_window_update_and_hide (MsdOsdWindow *window)
{
remove_hide_timeout (window);
add_hide_timeout (window);
diff --git a/plugins/common/gsd-osd-window.h b/plugins/common/msd-osd-window.h
index 0d8040b..f539e5e 100644
--- a/plugins/common/gsd-osd-window.h
+++ b/plugins/common/msd-osd-window.h
@@ -27,18 +27,18 @@
*
*/
-/* GsdOsdWindow is an "on-screen-display" window (OSD). It is the cute,
+/* MsdOsdWindow is an "on-screen-display" window (OSD). It is the cute,
* semi-transparent, curved popup that appears when you press a hotkey global to
* the desktop, such as to change the volume, switch your monitor's parameters,
* etc.
*
- * You can create a GsdOsdWindow and use it as a normal GtkWindow. It will
+ * You can create a MsdOsdWindow and use it as a normal GtkWindow. It will
* automatically center itself, figure out if it needs to be composited, etc.
* Just pack your widgets in it, sit back, and enjoy the ride.
*/
-#ifndef GSD_OSD_WINDOW_H
-#define GSD_OSD_WINDOW_H
+#ifndef MSD_OSD_WINDOW_H
+#define MSD_OSD_WINDOW_H
#include <glib-object.h>
#include <gtk/gtk.h>
@@ -48,39 +48,39 @@ extern "C" {
#endif
/* Alpha value to be used for foreground objects drawn in an OSD window */
-#define GSD_OSD_WINDOW_FG_ALPHA 1.0
+#define MSD_OSD_WINDOW_FG_ALPHA 1.0
-#define GSD_TYPE_OSD_WINDOW (gsd_osd_window_get_type ())
-#define GSD_OSD_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_OSD_WINDOW, GsdOsdWindow))
-#define GSD_OSD_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_OSD_WINDOW, GsdOsdWindowClass))
-#define GSD_IS_OSD_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_OSD_WINDOW))
-#define GSD_IS_OSD_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), GSD_TYPE_OSD_WINDOW))
-#define GSD_OSD_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_OSD_WINDOW, GsdOsdWindowClass))
+#define MSD_TYPE_OSD_WINDOW (msd_osd_window_get_type ())
+#define MSD_OSD_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MSD_TYPE_OSD_WINDOW, MsdOsdWindow))
+#define MSD_OSD_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MSD_TYPE_OSD_WINDOW, MsdOsdWindowClass))
+#define MSD_IS_OSD_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MSD_TYPE_OSD_WINDOW))
+#define MSD_IS_OSD_WINDOW_CLASS(klass) (G_TYPE_INSTANCE_GET_CLASS ((klass), MSD_TYPE_OSD_WINDOW))
+#define MSD_OSD_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MSD_TYPE_OSD_WINDOW, MsdOsdWindowClass))
-typedef struct GsdOsdWindow GsdOsdWindow;
-typedef struct GsdOsdWindowClass GsdOsdWindowClass;
-typedef struct GsdOsdWindowPrivate GsdOsdWindowPrivate;
+typedef struct MsdOsdWindow MsdOsdWindow;
+typedef struct MsdOsdWindowClass MsdOsdWindowClass;
+typedef struct MsdOsdWindowPrivate MsdOsdWindowPrivate;
-struct GsdOsdWindow {
+struct MsdOsdWindow {
GtkWindow parent;
- GsdOsdWindowPrivate *priv;
+ MsdOsdWindowPrivate *priv;
};
-struct GsdOsdWindowClass {
+struct MsdOsdWindowClass {
GtkWindowClass parent_class;
- void (* expose_when_composited) (GsdOsdWindow *window, cairo_t *cr);
+ void (* expose_when_composited) (MsdOsdWindow *window, cairo_t *cr);
};
-GType gsd_osd_window_get_type (void);
+GType msd_osd_window_get_type (void);
-GtkWidget * gsd_osd_window_new (void);
-gboolean gsd_osd_window_is_composited (GsdOsdWindow *window);
-gboolean gsd_osd_window_is_valid (GsdOsdWindow *window);
-void gsd_osd_window_update_and_hide (GsdOsdWindow *window);
+GtkWidget * msd_osd_window_new (void);
+gboolean msd_osd_window_is_composited (MsdOsdWindow *window);
+gboolean msd_osd_window_is_valid (MsdOsdWindow *window);
+void msd_osd_window_update_and_hide (MsdOsdWindow *window);
-void gsd_osd_window_draw_rounded_rectangle (cairo_t *cr,
+void msd_osd_window_draw_rounded_rectangle (cairo_t *cr,
gdouble aspect,
gdouble x,
gdouble y,
@@ -88,7 +88,7 @@ void gsd_osd_window_draw_rounded_rectangle (cairo_t *cr,
gdouble width,
gdouble height);
-void gsd_osd_window_color_reverse (const GdkColor *a,
+void msd_osd_window_color_reverse (const GdkColor *a,
GdkColor *b);
#ifdef __cplusplus