summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorquinn <quinn>2006-10-27 05:26:22 +0000
committerquinn <quinn>2006-10-27 05:26:22 +0000
commit142fd016132c192960305aace379852072dfbedf (patch)
tree8c2d12c154bedec0ab76a818a6d35888339991c6 /src
parent36465b212856cecae3ed73a29d6adeb164e1e7a5 (diff)
downloadberyl-manager-142fd016132c192960305aace379852072dfbedf.tar.gz
beryl-manager-142fd016132c192960305aace379852072dfbedf.tar.bz2
beryl-manager: add option to disable GL_Yield setting, remove useless strict-binding option (doesn't even fix what it was supposed to)
Diffstat (limited to 'src')
-rw-r--r--src/main.c30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/main.c b/src/main.c
index e7dbebd..93ed76d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,8 +31,7 @@ GMutex * mutx;
EggTrayIcon * mainIcon;
GtkWidget * menu;
GtkTooltips * tips;
-GtkWidget * useStrictBindingItem=NULL;
-gboolean useStrictBind=FALSE;
+gboolean noGLYield=FALSE;
gboolean hasMouse=FALSE;
gboolean berylLaunched=FALSE;
gboolean decoratorLaunched=FALSE;
@@ -246,13 +245,13 @@ void load_settings()
if (!XGL && NV9XXX)
{
b=g_key_file_get_boolean(f,"beryl-settings",
- "use_strict_binding",&e);
+ "no_gl_yield",&e);
if (!e)
- useStrictBind=b;
+ noGLYield=b;
e=NULL;
}
else
- useStrictBind=FALSE;
+ noGLYield=FALSE;
}
g_key_file_free(f);
g_free(path);
@@ -266,8 +265,8 @@ void save_settings()
g_key_file_set_integer(f,"wm-settings","active_dm",DM);
g_key_file_set_boolean(f,"wm-settings","use_fallback_wm",useFB);
if (!XGL && NV9XXX)
- g_key_file_set_boolean(f,"beryl-settings","use_strict_binding",
- useStrictBind);
+ g_key_file_set_boolean(f,"beryl-settings","no_gl_yield",
+ noGLYield);
g_file_set_contents(path,g_key_file_to_data(f,NULL,NULL),-1,NULL);
g_key_file_free(f);
g_free(path);
@@ -549,8 +548,8 @@ gpointer berylThread(gpointer d)
beryl_command = "beryl-xgl";
else
{
- if (useStrictBind)
- beryl_command = "beryl --strict-binding";
+ if (noGLYield)
+ beryl_command = "beryl --skip-gl-yield";
else
beryl_command = "beryl";
}
@@ -761,9 +760,9 @@ gboolean detect_dm(gint dm)
DM=-1;
return FALSE;
}
-void setUseStrict(GtkWidget * w, gpointer p)
+void setGLYield(GtkWidget * w, gpointer p)
{
- useStrictBind=gtk_check_menu_item_get_active(
+ noGLYield=gtk_check_menu_item_get_active(
GTK_CHECK_MENU_ITEM(w));
save_settings();
if (WM==0) reloadBeryl();
@@ -831,14 +830,13 @@ void init_menu()
if (!XGL && NV9XXX)
{
mitem = gtk_check_menu_item_new_with_label(_(
- "Enable Strict Binding\n"
- "Use this to avoid blank windows bug"));
+ "Disable GL Yield setting\n"
+ "Use this to fix some redraw bugs"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu),mitem);
gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(mitem),useStrictBind);
+ GTK_CHECK_MENU_ITEM(mitem),noGLYield);
gtk_widget_show(mitem);
- g_signal_connect(mitem,"toggled",G_CALLBACK(setUseStrict),NULL);
- useStrictBindingItem=mitem;
+ g_signal_connect(mitem,"toggled",G_CALLBACK(setGLYield),NULL);
}
mitem = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu),mitem);