[Xfce4-commits] [xfce/xfdesktop] 01/02: Replace GdkScreen deprecated functions
noreply at xfce.org
noreply at xfce.org
Sun Jan 13 15:45:46 CET 2019
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfdesktop.
commit 13ca675d2713b2da63c6869d0eb4d71a039a5393
Author: Andre Miranda <andreldm at xfce.org>
Date: Sun Jan 13 10:44:35 2019 -0300
Replace GdkScreen deprecated functions
---
common/xfdesktop-common.c | 7 -------
settings/main.c | 21 ++-------------------
src/xfce-desktop.c | 17 ++++++++++++-----
src/xfce-workspace.c | 32 +++-----------------------------
src/xfdesktop-icon-view.c | 27 +--------------------------
5 files changed, 18 insertions(+), 86 deletions(-)
diff --git a/common/xfdesktop-common.c b/common/xfdesktop-common.c
index ac92920..00fd729 100644
--- a/common/xfdesktop-common.c
+++ b/common/xfdesktop-common.c
@@ -57,7 +57,6 @@
gchar*
xfdesktop_get_monitor_name_from_gtk_widget(GtkWidget *widget, gint monitor_num)
{
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
GdkWindow *window = NULL;
GdkDisplay *display = NULL;
GdkMonitor *monitor = NULL;
@@ -67,12 +66,6 @@ xfdesktop_get_monitor_name_from_gtk_widget(GtkWidget *widget, gint monitor_num)
monitor = gdk_display_get_monitor(display, monitor_num);
return g_strdup(gdk_monitor_get_model(monitor));
-#else
- GdkScreen *screen = NULL;
-
- screen = gtk_widget_get_screen(widget);
- return gdk_screen_get_monitor_plug_name(screen, monitor_num);
-#endif
}
gint
diff --git a/settings/main.c b/settings/main.c
index c5d3eca..4303b7b 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -724,11 +724,7 @@ xfdesktop_settings_update_iconview_frame_name(AppearancePanel *panel,
workspace_name = g_strdup(wnck_workspace_get_name(workspace));
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
if(gdk_display_get_n_monitors(gtk_widget_get_display(panel->chk_apply_to_all)) > 1) {
-#else
- if(gdk_screen_get_n_monitors(gtk_widget_get_screen(panel->chk_apply_to_all)) > 1) {
-#endif
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all))) {
/* Multi-monitor single workspace */
if(panel->monitor_name) {
@@ -1486,7 +1482,6 @@ suboptions_set_sensitive(GtkToggleButton *btn,
gtk_widget_set_sensitive(box, gtk_toggle_button_get_active(btn));
}
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
static gint
display_get_monitor_num(GdkDisplay *display, GdkMonitor *monitor)
{
@@ -1503,7 +1498,6 @@ display_get_monitor_num(GdkDisplay *display, GdkMonitor *monitor)
g_warning("unable to get the monitor number");
return 0;
}
-#endif
static void
cb_update_background_tab(WnckWindow *wnck_window,
@@ -1515,10 +1509,8 @@ cb_update_background_tab(WnckWindow *wnck_window,
WnckWorkspace *wnck_workspace = NULL;
WnckScreen *wnck_screen = NULL;
GdkWindow *window = NULL;
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
GdkDisplay *display = NULL;
GdkMonitor *monitor = NULL;
-#endif
/* If we haven't found our window return now and wait for that */
if(panel->wnck_window == NULL)
@@ -1531,13 +1523,9 @@ cb_update_background_tab(WnckWindow *wnck_window,
workspace_num = xfdesktop_settings_get_active_workspace(panel, wnck_window);
screen_num = wnck_screen_get_number(wnck_screen);
window = gtk_widget_get_window(panel->image_iconview);
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
display = gdk_window_get_display(window);
monitor = gdk_display_get_monitor_at_window(display, window);
monitor_num = display_get_monitor_num(display, monitor);
-#else
- monitor_num = gdk_screen_get_monitor_at_window(gtk_widget_get_screen(panel->image_iconview), window);
-#endif
monitor_name = xfdesktop_get_monitor_name_from_gtk_widget(panel->image_iconview, monitor_num);
/* Most of the time we won't change monitor, screen, or workspace so try
@@ -1581,17 +1569,12 @@ cb_update_background_tab(WnckWindow *wnck_window,
*/
gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(panel->image_style_combo),
XFCE_BACKDROP_IMAGE_SPANNING_SCREENS);
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
+
if(panel->monitor == 0 && gdk_display_get_n_monitors(gtk_widget_get_display(panel->image_style_combo)) > 1) {
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel->image_style_combo),
_("Spanning screens"));
}
-#else
- if(panel->monitor == 0 && gdk_screen_get_n_monitors(gtk_widget_get_screen(panel->image_iconview)) > 1) {
- gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel->image_style_combo),
- _("Spanning screens"));
- }
-#endif
+
/* connect the new bindings */
xfdesktop_settings_background_tab_change_bindings(panel,
diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index dca2025..0893f25 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -443,6 +443,7 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
XfceDesktop *desktop = XFCE_DESKTOP(user_data);
cairo_surface_t *surface = desktop->priv->bg_surface;
GdkScreen *gscreen = desktop->priv->gscreen;
+ GdkDisplay *display;
gchar *new_filename = NULL;
GdkRectangle rect;
cairo_region_t *clip_region = NULL;
@@ -463,6 +464,7 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
TRACE("really entering");
+ display = gdk_display_get_default();
current_workspace = xfce_desktop_get_current_workspace(desktop);
/* Find out which monitor the backdrop is on */
@@ -502,12 +504,14 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
/* Spanning screens */
GdkRectangle monitor_rect;
- gdk_screen_get_monitor_geometry(gscreen, 0, &rect);
+ gdk_monitor_get_geometry(gdk_display_get_monitor(display, 0),
+ &rect);
/* Get the lowest x and y value for all the monitors in
* case none of them start at 0,0 for whatever reason.
*/
for(i = 1; i < xfce_desktop_get_n_monitors(desktop); i++) {
- gdk_screen_get_monitor_geometry(gscreen, i, &monitor_rect);
+ gdk_monitor_get_geometry(gdk_display_get_monitor(display, i),
+ &monitor_rect);
if(monitor_rect.x < rect.x)
rect.x = monitor_rect.x;
@@ -520,7 +524,8 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
XF_DEBUG("xinerama_stretch x %d, y %d, width %d, height %d",
rect.x, rect.y, rect.width, rect.height);
} else {
- gdk_screen_get_monitor_geometry(gscreen, monitor, &rect);
+ gdk_monitor_get_geometry(gdk_display_get_monitor(display, monitor),
+ &rect);
XF_DEBUG("monitor x %d, y %d, width %d, height %d",
rect.x, rect.y, rect.width, rect.height);
}
@@ -541,7 +546,9 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data)
for(i = 0; i < monitor; i++) {
GdkRectangle previous_monitor;
cairo_region_t *previous_region;
- gdk_screen_get_monitor_geometry(gscreen, i, &previous_monitor);
+
+ gdk_monitor_get_geometry(gdk_display_get_monitor(display, i),
+ &previous_monitor);
XF_DEBUG("previous_monitor: x: %d, y: %d, w: %d, h: %d",
previous_monitor.x, previous_monitor.y,
@@ -1572,7 +1579,7 @@ xfce_desktop_get_n_monitors(XfceDesktop *desktop)
{
g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), 0);
- return gdk_screen_get_n_monitors(desktop->priv->gscreen);
+ return gdk_display_get_n_monitors(gdk_screen_get_display(desktop->priv->gscreen));
}
gint
diff --git a/src/xfce-workspace.c b/src/xfce-workspace.c
index f94096e..7cb0c9e 100644
--- a/src/xfce-workspace.c
+++ b/src/xfce-workspace.c
@@ -144,19 +144,13 @@ xfce_workspace_set_xfconf_property_string(XfceWorkspace *workspace,
{
XfconfChannel *channel = workspace->priv->channel;
char buf[1024];
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
GdkDisplay *display;
-#endif
gchar *monitor_name = NULL;
TRACE("entering");
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
- display = gdk_display_manager_get_default_display(gdk_display_manager_get());
+ display = gdk_display_get_default();
monitor_name = g_strdup(gdk_monitor_get_model(gdk_display_get_monitor(display, monitor_num)));
-#else
- monitor_name = gdk_screen_get_monitor_plug_name(workspace->priv->gscreen, monitor_num);
-#endif
/* Get the backdrop's image property */
if(monitor_name == NULL) {
@@ -183,21 +177,15 @@ xfce_workspace_set_xfconf_property_value(XfceWorkspace *workspace,
XfconfChannel *channel = workspace->priv->channel;
char buf[1024];
gchar *monitor_name = NULL;
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
GdkDisplay *display;
-#endif
#ifdef G_ENABLE_DEBUG
gchar *contents = NULL;
#endif
TRACE("entering");
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
- display = gdk_display_manager_get_default_display(gdk_display_manager_get());
+ display = gdk_display_get_default();
monitor_name = g_strdup(gdk_monitor_get_model(gdk_display_get_monitor(display, monitor_num)));
-#else
- monitor_name = gdk_screen_get_monitor_plug_name(workspace->priv->gscreen, monitor_num);
-#endif
/* Get the backdrop's image property */
if(monitor_name == NULL) {
@@ -319,11 +307,7 @@ xfce_workspace_monitors_changed(XfceWorkspace *workspace,
/* When spanning screens we only need one backdrop */
n_monitors = 1;
} else {
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
n_monitors = gdk_display_get_n_monitors(gdk_screen_get_display(workspace->priv->gscreen));
-#else
- n_monitors = gdk_screen_get_n_monitors(workspace->priv->gscreen);
-#endif
}
/* Remove all backdrops so that the correct monitor is added/removed and
@@ -628,19 +612,13 @@ xfce_workspace_connect_backdrop_settings(XfceWorkspace *workspace,
XfconfChannel *channel = workspace->priv->channel;
char buf[1024];
gint pp_len;
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
GdkDisplay *display;
-#endif
gchar *monitor_name = NULL;
TRACE("entering");
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
- display = gdk_display_manager_get_default_display(gdk_display_manager_get());
+ display = gdk_display_get_default();
monitor_name = g_strdup(gdk_monitor_get_model(gdk_display_get_monitor(display, monitor)));
-#else
- monitor_name = gdk_screen_get_monitor_plug_name(workspace->priv->gscreen, monitor);
-#endif
if(monitor_name == NULL) {
g_snprintf(buf, sizeof(buf), "%smonitor%d/workspace%d/",
@@ -735,11 +713,7 @@ xfce_workspace_remove_backdrops(XfceWorkspace *workspace)
g_return_if_fail(XFCE_IS_WORKSPACE(workspace));
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
n_monitors = gdk_display_get_n_monitors(gdk_screen_get_display(workspace->priv->gscreen));
-#else
- n_monitors = gdk_screen_get_n_monitors(workspace->priv->gscreen);
-#endif
for(i = 0; i < n_monitors && i < workspace->priv->nbackdrops; ++i) {
xfce_workspace_disconnect_backdrop_settings(workspace,
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index 0900f0e..11c8dba 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -2565,37 +2565,23 @@ xfdesktop_rectangle_is_bounded_by(GdkRectangle *rect,
static void
xfdesktop_icon_view_setup_grids_xinerama(XfdesktopIconView *icon_view)
{
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
GdkDisplay *display;
-#else
- GdkScreen *gscreen;
-#endif
GdkRectangle *monitor_geoms, cell_rect;
gint nmonitors, i, row, col;
DBG("entering");
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
display = gtk_widget_get_display(GTK_WIDGET(icon_view));
nmonitors = gdk_display_get_n_monitors(display);
-#else
- gscreen = gtk_widget_get_screen(GTK_WIDGET(icon_view));
- nmonitors = gdk_screen_get_n_monitors(gscreen);
-#endif
+
if(nmonitors == 1) /* optimisation */
return;
monitor_geoms = g_new0(GdkRectangle, nmonitors);
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
for(i = 0; i < nmonitors; ++i) {
gdk_monitor_get_geometry(gdk_display_get_monitor(display, i), &monitor_geoms[i]);
}
-#else
- for(i = 0; i < nmonitors; ++i) {
- gdk_screen_get_monitor_geometry(gscreen, i, &monitor_geoms[i]);
- }
-#endif
/* cubic time; w00t! */
cell_rect.width = cell_rect.height = CELL_SIZE;
@@ -3639,9 +3625,7 @@ xfdesktop_icon_view_add_item_internal(XfdesktopIconView *icon_view,
{
gint16 row, col;
cairo_rectangle_int_t fake_area;
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
GdkDrawingContext *gdc;
-#endif
cairo_region_t *region;
cairo_t *cr;
GdkWindow *gdkwindow;
@@ -3672,23 +3656,14 @@ xfdesktop_icon_view_add_item_internal(XfdesktopIconView *icon_view,
/* Pack it into a cairo region to tell gdk that's where we will be painting */
region = cairo_region_create_rectangle(&fake_area);
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
gdc = gdk_window_begin_draw_frame(gdkwindow, region);
cr = gdk_drawing_context_get_cairo_context(gdc);
-#else
- cr = gdk_cairo_create(gdkwindow);
-#endif
/* paint the icon */
xfdesktop_icon_view_paint_icon(icon_view, icon, &fake_area, cr);
-#if 0 /* GTK_CHECK_VERSION (3, 22, 0) */
/* we're done drawing */
gdk_window_end_draw_frame(gdkwindow, gdc);
-#else
- /* we're done drawing */
- cairo_destroy(cr);
-#endif
cairo_region_destroy(region);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list