summaryrefslogtreecommitdiff
path: root/capplets/appearance
diff options
context:
space:
mode:
Diffstat (limited to 'capplets/appearance')
-rw-r--r--capplets/appearance/appearance-font.c62
-rw-r--r--capplets/appearance/appearance-main.c16
-rw-r--r--capplets/appearance/appearance.h5
3 files changed, 78 insertions, 5 deletions
diff --git a/capplets/appearance/appearance-font.c b/capplets/appearance/appearance-font.c
index 1c1d96d5..8e157676 100644
--- a/capplets/appearance/appearance-font.c
+++ b/capplets/appearance/appearance-font.c
@@ -421,20 +421,40 @@ dpi_from_pixels_and_mm (int pixels, int mm)
}
static double
-get_dpi_from_x_server (void)
+get_dpi_from_x_server_or_monitor (void)
{
GdkScreen *screen;
+ GdkDisplay *display;
double dpi;
screen = gdk_screen_get_default ();
+ display = gdk_display_get_default();
if (screen) {
double width_dpi, height_dpi;
- Screen *xscreen = gdk_x11_screen_get_xscreen (screen);
+ if (GDK_IS_X11_DISPLAY (display))
+ {
+ Screen *xscreen = gdk_x11_screen_get_xscreen (screen);
- width_dpi = dpi_from_pixels_and_mm (WidthOfScreen (xscreen), WidthMMOfScreen (xscreen));
- height_dpi = dpi_from_pixels_and_mm (HeightOfScreen (xscreen), HeightMMOfScreen (xscreen));
+ width_dpi = dpi_from_pixels_and_mm (WidthOfScreen (xscreen), WidthMMOfScreen (xscreen));
+ height_dpi = dpi_from_pixels_and_mm (HeightOfScreen (xscreen), HeightMMOfScreen (xscreen));
+ }
+ else
+ {
+ GdkMonitor *monitor;
+ GdkRectangle geometry = {0};
+
+ /*FIXME: we have to use the main monitor for this
+ *which may not always be the leftmost monitor
+ *Separate per-monitor settings for this would be ideal
+ */
+ monitor = gdk_display_get_monitor (display, 0);
+ gdk_monitor_get_geometry (monitor, &geometry);
+
+ width_dpi = dpi_from_pixels_and_mm (geometry.width, gdk_monitor_get_width_mm(monitor));
+ height_dpi = dpi_from_pixels_and_mm (geometry.height, gdk_monitor_get_height_mm(monitor));
+ }
if (width_dpi < DPI_LOW_REASONABLE_VALUE || width_dpi > DPI_HIGH_REASONABLE_VALUE ||
height_dpi < DPI_LOW_REASONABLE_VALUE || height_dpi > DPI_HIGH_REASONABLE_VALUE)
@@ -465,7 +485,7 @@ dpi_load (GSettings *settings,
dpi = g_settings_get_double (settings, FONT_DPI_KEY);
if (dpi == 0)
- dpi = get_dpi_from_x_server ();
+ dpi = get_dpi_from_x_server_or_monitor ();
dpi *= (double)scale;
dpi = CLAMP(dpi, DPI_LOW_REASONABLE_VALUE, DPI_HIGH_REASONABLE_VALUE);
@@ -781,6 +801,38 @@ void font_init(AppearanceData* data)
G_CALLBACK (marco_changed),
data);
+ /*In a wayland session we must manage MATE font settings for xwayland
+ *and also manage GNOME font settings for native wayland applications
+ *so if not running under x11, set the GNOME interface keys too
+ *Ignore this if for any reason the GNOME schema was not found,
+ *As we can only set this for compositors using either the MATE or the GNOME gsettings
+ */
+ if (data->interface_gnome_settings)
+ {
+ widget = appearance_capplet_get_widget(data, "application_font");
+ g_settings_bind (data->interface_gnome_settings,
+ GTK_FONT_KEY,
+ G_OBJECT (widget),
+ "font-name",
+ G_SETTINGS_BIND_DEFAULT);
+
+ widget = appearance_capplet_get_widget (data, "document_font");
+ g_settings_bind (data->interface_gnome_settings,
+ DOCUMENT_FONT_KEY,
+ G_OBJECT (widget),
+ "font-name",
+ G_SETTINGS_BIND_DEFAULT);
+
+/* The monospace font seems to apply properly if and only if set only for MATE
+ widget = appearance_capplet_get_widget (data, "monospace_font");
+ g_settings_bind (data->interface_gnome_settings,
+ MONOSPACE_FONT_KEY,
+ G_OBJECT (widget),
+ "font-name",
+ G_SETTINGS_BIND_DEFAULT);
+*/
+ }
+
g_signal_connect (appearance_capplet_get_widget (data, "add_new_font"), "clicked", G_CALLBACK (cb_add_new_font), data);
marco_titlebar_load_sensitivity(data);
diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c
index 2a9b92eb..8e19c02b 100644
--- a/capplets/appearance/appearance-main.c
+++ b/capplets/appearance/appearance-main.c
@@ -31,6 +31,7 @@
#include "theme-thumbnail.h"
#include "activate-settings-daemon.h"
#include "capplet-util.h"
+#include <gdk/gdkx.h>
static AppearanceData *
init_appearance_data (int *argc, char ***argv, GOptionContext *context)
@@ -56,6 +57,21 @@ init_appearance_data (int *argc, char ***argv, GOptionContext *context)
data->filechooser_settings = g_settings_new (FILECHOOSER_SCHEMA);
data->interface_settings = g_settings_new (INTERFACE_SCHEMA);
+
+ data->interface_gnome_settings = NULL;
+ /*Load the gnome interface schema if we are running under wayland and it is present*/
+ if (!(GDK_IS_X11_DISPLAY (gdk_display_get_default())))
+ {
+ GSettingsSchemaSource *source = g_settings_schema_source_get_default ();
+
+ if (source)
+ {
+ GSettingsSchema *schema = g_settings_schema_source_lookup (source, INTERFACE_GNOME_SCHEMA, TRUE);
+
+ if (schema)
+ data->interface_gnome_settings = g_settings_new_full (schema, NULL, NULL);
+ }
+ }
data->marco_settings = g_settings_new (MARCO_SCHEMA);
data->mouse_settings = g_settings_new (MOUSE_SCHEMA);
data->font_settings = g_settings_new (FONT_RENDER_SCHEMA);
diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h
index 0a01ddcf..9a16afcf 100644
--- a/capplets/appearance/appearance.h
+++ b/capplets/appearance/appearance.h
@@ -58,6 +58,7 @@
#define GTK_THEME_KEY "gtk-theme"
#define ICON_THEME_KEY "icon-theme"
#define INTERFACE_SCHEMA "org.mate.interface"
+#define INTERFACE_GNOME_SCHEMA "org.gnome.desktop.interface"
#define MENU_ICONS_KEY "menus-have-icons"
#define MONOSPACE_FONT_KEY "monospace-font-name"
#define TOOLBAR_STYLE_KEY "toolbar-style"
@@ -92,6 +93,10 @@ typedef struct {
GSettings* caja_settings;
GSettings* filechooser_settings;
GSettings* interface_settings;
+ /*We have to accomodate wayland theme setting here
+ *whether we are using it or not
+ */
+ GSettings* interface_gnome_settings;
GSettings* marco_settings;
GSettings* mouse_settings;
GSettings* font_settings;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 17:47:04 +0000