diff -Naur xfwm4-4.7.3-orig//defaults/defaults xfwm4-4.7.3/defaults/defaults --- xfwm4-4.7.3-orig//defaults/defaults 2010-12-05 15:35:37.000000000 +0100 +++ xfwm4-4.7.3/defaults/defaults 2011-01-01 23:37:17.000000000 +0100 @@ -21,6 +21,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.7.3-orig//settings-dialogs/tweaks-settings.c xfwm4-4.7.3/settings-dialogs/tweaks-settings.c --- xfwm4-4.7.3-orig//settings-dialogs/tweaks-settings.c 2010-12-05 15:35:37.000000000 +0100 +++ xfwm4-4.7.3/settings-dialogs/tweaks-settings.c 2011-01-01 23:37:17.000000000 +0100 @@ -117,6 +117,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)) @@ -180,6 +186,7 @@ /* Workspaces tab */ GtkWidget *scroll_workspaces_check = GTK_WIDGET (gtk_builder_get_object (builder, "scroll_workspaces_check")); + GtkWidget *invert_scroll_workspaces_check = GTK_WIDGET (gtk_builder_get_object (builder, "invert_scroll_workspaces_check")); GtkWidget *toggle_workspaces_check = GTK_WIDGET (gtk_builder_get_object (builder, "toggle_workspaces_check")); GtkWidget *wrap_layout_check = GTK_WIDGET (gtk_builder_get_object (builder, "wrap_layout_check")); GtkWidget *wrap_cycle_check = GTK_WIDGET (gtk_builder_get_object (builder, "wrap_cycle_check")); @@ -264,6 +271,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), @@ -352,6 +365,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.7.3-orig//src/events.c xfwm4-4.7.3/src/events.c --- xfwm4-4.7.3-orig//src/events.c 2010-12-05 15:35:36.000000000 +0100 +++ xfwm4-4.7.3/src/events.c 2011-01-01 23:37:17.000000000 +0100 @@ -844,11 +844,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.7.3-orig//src/settings.c xfwm4-4.7.3/src/settings.c --- xfwm4-4.7.3-orig//src/settings.c 2010-12-05 15:35:36.000000000 +0100 +++ xfwm4-4.7.3/src/settings.c 2011-01-01 23:37:17.000000000 +0100 @@ -664,6 +664,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}, @@ -688,6 +689,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}, @@ -839,6 +841,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); @@ -1328,6 +1332,10 @@ { screen_info->params->snap_resist = 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.7.3-orig//src/settings.h xfwm4-4.7.3/src/settings.h --- xfwm4-4.7.3-orig//src/settings.h 2010-12-05 15:35:37.000000000 +0100 +++ xfwm4-4.7.3/src/settings.h 2011-01-01 23:37:17.000000000 +0100 @@ -205,6 +205,7 @@ gboolean focus_new; gboolean full_width_title; gboolean mousewheel_rollup; + gboolean invert_scroll_workspaces; gboolean prevent_focus_stealing; gboolean raise_on_click; gboolean raise_on_focus; --- xfwm4-4.7.3-orig/settings-dialogs/xfwm4-tweaks-dialog.glade 2010-12-05 15:35:37.000000000 +0100 +++ xfwm4-4.7.3/settings-dialogs/xfwm4-tweaks-dialog.glade 2011-01-02 23:40:14.000000000 +0100 @@ -440,6 +440,28 @@ + + True + 12 + + + _Invert mouse wheel workspace switching direction + True + True + True + False + True + True + + + + + False + False + 1 + + + _Remember and recall previous workspace when switching via keyboard shortcuts @@ -452,7 +474,7 @@ False False - 1 + 2 @@ -467,7 +489,7 @@ False False - 2 + 3 @@ -482,7 +504,7 @@ False False - 3 + 4 --- xfwm4-4.7.4-orig/settings-dialogs/Makefile.in 2011-01-02 14:27:08.000000000 +0100 +++ xfwm4-4.7.4/settings-dialogs/Makefile.in 2011-01-04 20:57:27.000000000 +0100 @@ -848,8 +848,8 @@ @MAINTAINER_MODE_TRUE@xfwm4-dialog_ui.h: xfwm4-dialog.glade @MAINTAINER_MODE_TRUE@ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=xfwm4_dialog_ui $< >$@ -@MAINTAINER_MODE_TRUE@xfwm4-tweaks-dialog_ui.h: xfwm4-tweaks-dialog.glade -@MAINTAINER_MODE_TRUE@ $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=tweaks_dialog_ui $< >$@ +xfwm4-tweaks-dialog_ui.h: xfwm4-tweaks-dialog.glade + $(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=tweaks_dialog_ui $< >$@ @MAINTAINER_MODE_TRUE@monitor-icon.h: $(srcdir)/monitor-icon.png @MAINTAINER_MODE_TRUE@ $(AM_V_GEN) gdk-pixbuf-csource --raw --build-list \