diff -Naur xfwm4-4.5.92-orig/defaults/defaults xfwm4-4.5.92/defaults/defaults
--- xfwm4-4.5.92-orig/defaults/defaults 2008-11-11 23:54:32.000000000 +0100
+++ xfwm4-4.5.92/defaults/defaults 2008-11-16 17:29:26.000000000 +0100
@@ -19,6 +19,7 @@
frame_opacity=100
full_width_title=true
inactive_opacity=100
+invert_scroll_workspaces=false
maximized_offset=0
move_opacity=100
placement_mode=center
diff -Naur xfwm4-4.5.92-orig/settings-dialogs/tweaks-settings.c xfwm4-4.5.92/settings-dialogs/tweaks-settings.c
--- xfwm4-4.5.92-orig/settings-dialogs/tweaks-settings.c 2008-11-11 23:53:04.000000000 +0100
+++ xfwm4-4.5.92/settings-dialogs/tweaks-settings.c 2008-11-16 17:29:26.000000000 +0100
@@ -111,6 +111,12 @@
}
static void
+cb_scroll_workspaces_toggled (GtkToggleButton *toggle, GtkWidget *invert)
+{
+ gtk_widget_set_sensitive (invert, gtk_toggle_button_get_active (toggle));
+}
+
+static void
cb_activate_placement_center_radio_toggled (GtkToggleButton *toggle, XfconfChannel *channel)
{
if (gtk_toggle_button_get_active (toggle))
@@ -174,6 +180,7 @@
/* Workspaces tab */
GtkWidget *scroll_workspaces_check = glade_xml_get_widget (gxml, "scroll_workspaces_check");
+ GtkWidget *invert_scroll_workspaces_check = glade_xml_get_widget (gxml, "invert_scroll_workspaces_check");
GtkWidget *toggle_workspaces_check = glade_xml_get_widget (gxml, "toggle_workspaces_check");
GtkWidget *wrap_layout_check = glade_xml_get_widget (gxml, "wrap_layout_check");
GtkWidget *wrap_cycle_check = glade_xml_get_widget (gxml, "wrap_cycle_check");
@@ -258,6 +265,12 @@
G_CALLBACK (cb_prevent_focus_stealing_check_button_toggled),
prevent_focus_stealing_box);
#endif
+
+ g_signal_connect (G_OBJECT (scroll_workspaces_check),
+ "toggled",
+ G_CALLBACK (cb_scroll_workspaces_toggled),
+ invert_scroll_workspaces_check);
+
g_signal_connect (G_OBJECT (placement_center_option),
"toggled",
G_CALLBACK (cb_activate_placement_center_radio_toggled),
@@ -346,6 +359,10 @@
G_TYPE_BOOLEAN,
(GObject *)scroll_workspaces_check, "active");
xfconf_g_property_bind (xfwm4_channel,
+ "/general/invert_scroll_workspaces",
+ G_TYPE_BOOLEAN,
+ (GObject *)invert_scroll_workspaces_check, "active");
+ xfconf_g_property_bind (xfwm4_channel,
"/general/wrap_layout",
G_TYPE_BOOLEAN,
(GObject *)wrap_layout_check, "active");
diff -Naur xfwm4-4.5.92-orig/settings-dialogs/xfwm4-tweaks-dialog.glade xfwm4-4.5.92/settings-dialogs/xfwm4-tweaks-dialog.glade
--- xfwm4-4.5.92-orig/settings-dialogs/xfwm4-tweaks-dialog.glade 2008-11-11 23:53:04.000000000 +0100
+++ xfwm4-4.5.92/settings-dialogs/xfwm4-tweaks-dialog.glade 2008-11-16 17:29:26.000000000 +0100
@@ -390,6 +390,29 @@
+
+ True
+ 6
+ 12
+
+
+ True
+ False
+ True
+ _Invert mouse wheel workspace switching direction
+ True
+ 0
+ True
+
+
+
+
+ False
+ False
+ 1
+
+
+
True
True
@@ -402,7 +425,7 @@
False
False
- 1
+ 2
@@ -417,7 +440,7 @@
False
False
- 2
+ 3
@@ -432,7 +455,7 @@
False
False
- 3
+ 4
diff -Naur xfwm4-4.5.92-orig/src/events.c xfwm4-4.5.92/src/events.c
--- xfwm4-4.5.92-orig/src/events.c 2008-11-11 23:54:27.000000000 +0100
+++ xfwm4-4.5.92/src/events.c 2008-11-16 17:29:26.000000000 +0100
@@ -811,11 +811,13 @@
if (ev->button == Button4)
{
- workspaceSwitch (screen_info, screen_info->current_ws - 1, NULL, TRUE, ev->time);
+ workspaceSwitch (screen_info, screen_info->current_ws - (screen_info->params->invert_scroll_workspaces ? -1 : 1), NULL, TRUE, ev->time);
+
}
else if (ev->button == Button5)
{
- workspaceSwitch (screen_info, screen_info->current_ws + 1, NULL, TRUE, ev->time);
+ workspaceSwitch (screen_info, screen_info->current_ws + (screen_info->params->invert_scroll_workspaces ? -1 : 1), NULL, TRUE, ev->time);
+
}
}
diff -Naur xfwm4-4.5.92-orig/src/settings.c xfwm4-4.5.92/src/settings.c
--- xfwm4-4.5.92-orig/src/settings.c 2008-11-11 23:54:27.000000000 +0100
+++ xfwm4-4.5.92/src/settings.c 2008-11-16 17:29:26.000000000 +0100
@@ -632,6 +632,7 @@
{"inactive_hilight_2", NULL, G_TYPE_STRING, FALSE},
{"inactive_shadow_2", NULL, G_TYPE_STRING, FALSE},
{"inactive_mid_2", NULL, G_TYPE_STRING, FALSE},
+ {"invert_scroll_workspaces", NULL, G_TYPE_BOOLEAN, FALSE},
/* You can change the order of the following parameters */
{"activate_action", NULL, G_TYPE_STRING, TRUE},
{"borderless_maximize", NULL, G_TYPE_BOOLEAN, TRUE},
@@ -654,6 +655,7 @@
{"frame_opacity", NULL, G_TYPE_INT, TRUE},
{"full_width_title", NULL, G_TYPE_BOOLEAN, TRUE},
{"inactive_opacity", NULL, G_TYPE_INT, TRUE},
+ {"invert_scroll_workspaces", NULL, G_TYPE_BOOLEAN, FALSE},
{"margin_bottom", NULL, G_TYPE_INT, FALSE},
{"margin_left", NULL, G_TYPE_INT, FALSE},
{"margin_right", NULL, G_TYPE_INT, FALSE},
@@ -909,6 +911,8 @@
getBoolValue ("wrap_cycle", rc);
screen_info->params->scroll_workspaces =
getBoolValue ("scroll_workspaces", rc);
+ screen_info->params->invert_scroll_workspaces =
+ getBoolValue ("invert_scroll_workspaces", rc);
screen_info->params->wrap_resistance =
getIntValue ("wrap_resistance", rc);
@@ -1347,6 +1351,10 @@
{
screen_info->params->scroll_workspaces = g_value_get_boolean (value);
}
+ else if (!strcmp (name, "invert_scroll_workspaces"))
+ {
+ screen_info->params->invert_scroll_workspaces = g_value_get_boolean (value);
+ }
else if (!strcmp (name, "toggle_workspaces"))
{
screen_info->params->toggle_workspaces = g_value_get_boolean (value);
diff -Naur xfwm4-4.5.92-orig/src/settings.h xfwm4-4.5.92/src/settings.h
--- xfwm4-4.5.92-orig/src/settings.h 2008-11-11 23:54:27.000000000 +0100
+++ xfwm4-4.5.92/src/settings.h 2008-11-16 17:29:26.000000000 +0100
@@ -201,6 +201,7 @@
gboolean focus_hint;
gboolean focus_new;
gboolean full_width_title;
+ gboolean invert_scroll_workspaces;
gboolean prevent_focus_stealing;
gboolean raise_on_click;
gboolean raise_on_focus;