summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--defaults/defaults1
-rw-r--r--settings-dialogs/tweaks-settings.c24
-rw-r--r--settings-dialogs/xfwm4-tweaks-dialog.glade42
-rw-r--r--src/settings.c9
-rw-r--r--src/settings.h3
-rw-r--r--src/tabwin.c3
6 files changed, 56 insertions, 26 deletions
diff --git a/defaults/defaults b/defaults/defaults
index e93717844..6d7184ab6 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -10,6 +10,7 @@ cycle_draw_frame=true
cycle_apps_only=false
cycle_hidden=true
cycle_minimum=true
+cycle_preview=false
cycle_tabwin_mode=0
cycle_workspaces=false
double_click_time=250
diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
index 6086c5def..8585c5302 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -205,10 +205,11 @@ 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"));
GtkWidget *show_dock_shadow_check = GTK_WIDGET (gtk_builder_get_object (builder, "show_dock_shadow_check"));
- GtkWidget *sync_to_vblank_check = GTK_WIDGET (gtk_builder_get_object (builder, "sync_to_vblank_check"));
GtkWidget *frame_opacity_scale = GTK_WIDGET (gtk_builder_get_object (builder, "frame_opacity_scale"));
GtkWidget *inactive_opacity_scale = GTK_WIDGET (gtk_builder_get_object (builder, "inactive_opacity_scale"));
@@ -398,6 +399,18 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
"/general/unredirect_overlays",
G_TYPE_BOOLEAN,
(GObject *)unredirect_overlays_check, "active");
+#ifdef HAVE_LIBDRM
+ 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,
+ (GObject *)cycle_preview_check, "active");
xfconf_g_property_bind (xfwm4_channel,
"/general/show_frame_shadow",
G_TYPE_BOOLEAN,
@@ -410,15 +423,6 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
"/general/show_dock_shadow",
G_TYPE_BOOLEAN,
(GObject *)show_dock_shadow_check, "active");
-#ifdef HAVE_LIBDRM
- 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/frame_opacity",
G_TYPE_INT,
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index 7919ae077..3d378eff1 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -887,6 +887,22 @@ when switching via keyboard shortcuts</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>
+ <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">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkCheckButton" id="show_popup_shadow_check">
<property name="label" translatable="yes">Show shadows under pop_up windows</property>
<property name="use_action_appearance">False</property>
@@ -899,7 +915,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -915,7 +931,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -931,7 +947,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
@@ -946,7 +962,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child>
@@ -1006,7 +1022,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child>
@@ -1021,7 +1037,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">7</property>
+ <property name="position">8</property>
</packing>
</child>
<child>
@@ -1081,7 +1097,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">8</property>
+ <property name="position">9</property>
</packing>
</child>
<child>
@@ -1096,7 +1112,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">9</property>
+ <property name="position">10</property>
</packing>
</child>
<child>
@@ -1156,7 +1172,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">10</property>
+ <property name="position">11</property>
</packing>
</child>
<child>
@@ -1171,7 +1187,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">11</property>
+ <property name="position">12</property>
</packing>
</child>
<child>
@@ -1231,7 +1247,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">12</property>
+ <property name="position">13</property>
</packing>
</child>
<child>
@@ -1246,7 +1262,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">13</property>
+ <property name="position">14</property>
</packing>
</child>
<child>
@@ -1306,7 +1322,7 @@ when switching via keyboard shortcuts</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">14</property>
+ <property name="position">15</property>
</packing>
</child>
</object>
diff --git a/src/settings.c b/src/settings.c
index affe8754b..97b8df17f 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -17,7 +17,7 @@
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2011 Olivier Fourdan,
+ xfwm4 - (c) 2002-2015 Olivier Fourdan,
2008 Jannis Pohlmann
*/
@@ -716,6 +716,7 @@ loadSettings (ScreenInfo *screen_info)
{"cycle_draw_frame", NULL, G_TYPE_BOOLEAN, TRUE},
{"cycle_hidden", NULL, G_TYPE_BOOLEAN, TRUE},
{"cycle_minimum", NULL, G_TYPE_BOOLEAN, TRUE},
+ {"cycle_preview", NULL, G_TYPE_BOOLEAN, TRUE},
{"cycle_tabwin_mode", NULL, G_TYPE_INT, FALSE},
{"cycle_workspaces", NULL, G_TYPE_BOOLEAN, TRUE},
{"double_click_time", NULL, G_TYPE_INT, TRUE},
@@ -809,6 +810,8 @@ loadSettings (ScreenInfo *screen_info)
getBoolValue ("cycle_draw_frame", rc);
screen_info->params->cycle_hidden =
getBoolValue ("cycle_hidden", rc);
+ screen_info->params->sync_to_vblank =
+ getBoolValue ("cycle_preview", rc);
screen_info->params->cycle_tabwin_mode =
CLAMP (getIntValue ("cycle_tabwin_mode", rc), 0, 1);
screen_info->params->cycle_workspaces =
@@ -1340,6 +1343,10 @@ cb_xfwm4_channel_property_changed(XfconfChannel *channel, const gchar *property_
{
screen_info->params->cycle_apps_only = g_value_get_boolean (value);
}
+ else if (!strcmp (name, "cycle_preview"))
+ {
+ screen_info->params->cycle_preview = g_value_get_boolean (value);
+ }
else if (!strcmp (name, "focus_hint"))
{
screen_info->params->focus_hint = g_value_get_boolean (value);
diff --git a/src/settings.h b/src/settings.h
index 7c84b32b0..89e1eea56 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -17,7 +17,7 @@
oroborus - (c) 2001 Ken Lynch
- xfwm4 - (c) 2002-2011 Olivier Fourdan
+ xfwm4 - (c) 2002-2015 Olivier Fourdan
*/
@@ -210,6 +210,7 @@ struct _XfwmParams
gboolean cycle_draw_frame;
gboolean cycle_hidden;
gboolean cycle_minimum;
+ gboolean cycle_preview;
gboolean cycle_workspaces;
gboolean focus_hint;
gboolean focus_new;
diff --git a/src/tabwin.c b/src/tabwin.c
index 18891517d..4e837e777 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -709,7 +709,8 @@ computeTabwinData (ScreenInfo *screen_info, TabwinWidget *tabwin_widget)
tabwin->monitor_width = getMinMonitorWidth (screen_info);
tabwin->monitor_height = getMinMonitorHeight (screen_info);
tabwin->label_height = 30;
- preview = compositorWindowPixmapAvailable (screen_info);
+ preview = screen_info->params->cycle_preview &
+ compositorWindowPixmapAvailable (screen_info);
/* We need to account for changes to the font size in the user's
* appearance theme and gtkrc settings */
View Lorry Controller Status