[Xfce4-commits] [xfce/xfwm4] 07/08: compositor: Remove vblank option
noreply at xfce.org
noreply at xfce.org
Mon May 15 09:09:51 CEST 2017
This is an automated email from the git hooks/post-receive script.
olivier pushed a commit to branch master
in repository xfce/xfwm4.
commit 7115d1b4f4021043bb59e6acafa105cb77fe5b9d
Author: Olivier Fourdan <fourdan at xfce.org>
Date: Mon May 15 08:56:42 2017 +0200
compositor: Remove vblank option
This is a leftover of the old (broken) vblank code.
---
settings-dialogs/tweaks-settings.c | 9 ---------
settings-dialogs/xfwm4-tweaks-dialog.glade | 16 ----------------
src/compositor.c | 13 +------------
src/settings.c | 6 ------
src/settings.h | 1 -
5 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
index 7c4f1f7..95755ac 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -205,7 +205,6 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
GtkWidget *use_compositing_box = GTK_WIDGET (gtk_builder_get_object (builder, "use_compositing_box"));
GtkWidget *unredirect_overlays_check = GTK_WIDGET (gtk_builder_get_object (builder, "unredirect_overlays_check"));
- GtkWidget *sync_to_vblank_check = GTK_WIDGET (gtk_builder_get_object (builder, "sync_to_vblank_check"));
GtkWidget *cycle_preview_check = GTK_WIDGET (gtk_builder_get_object (builder, "cycle_preview_check"));
GtkWidget *show_frame_shadow_check = GTK_WIDGET (gtk_builder_get_object (builder, "show_frame_shadow_check"));
GtkWidget *show_popup_shadow_check = GTK_WIDGET (gtk_builder_get_object (builder, "show_popup_shadow_check"));
@@ -399,14 +398,6 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
"/general/unredirect_overlays",
G_TYPE_BOOLEAN,
(GObject *)unredirect_overlays_check, "active");
-#ifdef HAVE_EPOXY
- xfconf_g_property_bind (xfwm4_channel,
- "/general/sync_to_vblank",
- G_TYPE_BOOLEAN,
- (GObject *)sync_to_vblank_check, "active");
-#else
- gtk_widget_hide (sync_to_vblank_check);
-#endif
xfconf_g_property_bind (xfwm4_channel,
"/general/cycle_preview",
G_TYPE_BOOLEAN,
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 3d378ef..abc3519 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -871,22 +871,6 @@ when switching via keyboard shortcuts</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="sync_to_vblank_check">
- <property name="label" translatable="yes">Synchronize drawing to the _vertical blank</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="cycle_preview_check">
<property name="label" translatable="yes">Show windows preview in place of icons when cycling</property>
<property name="use_action_appearance">False</property>
diff --git a/src/compositor.c b/src/compositor.c
index dec36ab..6d623d9 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1049,13 +1049,6 @@ check_gl_error (void)
}
static gboolean
-vblank_enabled (ScreenInfo *screen_info)
-{
- return (screen_info->params->sync_to_vblank &&
- (screen_info->has_glx_video_sync || screen_info->has_glx_sync_control));
-}
-
-static gboolean
check_glx_renderer (ScreenInfo *screen_info)
{
const char *glRenderer;
@@ -2232,10 +2225,7 @@ paint_all (ScreenInfo *screen_info, XserverRegion region, gushort buffer)
if (screen_info->use_glx) /* glx first if available */
{
glXWaitX ();
- if (vblank_enabled (screen_info))
- {
- wait_glx_vblank (screen_info);
- }
+ wait_glx_vblank (screen_info);
bind_glx_texture (screen_info,
screen_info->rootPixmap[buffer]);
redraw_glx_texture (screen_info);
@@ -4432,7 +4422,6 @@ compositorManageScreen (ScreenInfo *screen_info)
g_warning ("No vsync support in compositor");
}
-
XFixesSelectCursorInput (display_info->dpy,
screen_info->xroot,
XFixesDisplayCursorNotifyMask);
diff --git a/src/settings.c b/src/settings.c
index ce2f8c0..a0dbb4a 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -878,8 +878,6 @@ loadSettings (ScreenInfo *screen_info)
getBoolValue ("snap_resist", rc);
screen_info->params->snap_width =
getIntValue ("snap_width", rc);
- screen_info->params->sync_to_vblank =
- getBoolValue ("sync_to_vblank", rc);
screen_info->params->tile_on_move =
getBoolValue ("tile_on_move", rc);
screen_info->params->toggle_workspaces =
@@ -1405,10 +1403,6 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
{
screen_info->params->tile_on_move = g_value_get_boolean (value);
}
- else if (!strcmp (name, "sync_to_vblank"))
- {
- screen_info->params->sync_to_vblank = g_value_get_boolean (value);
- }
else if (!strcmp (name, "toggle_workspaces"))
{
screen_info->params->toggle_workspaces = g_value_get_boolean (value);
diff --git a/src/settings.h b/src/settings.h
index b1467b9..845fcbe 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -230,7 +230,6 @@ struct _XfwmParams
gboolean snap_resist;
gboolean snap_to_border;
gboolean snap_to_windows;
- gboolean sync_to_vblank;
gboolean tile_on_move;
gboolean title_vertical_offset_active;
gboolean title_vertical_offset_inactive;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list