[Xfce4-commits] r29454 - in xfwm4/trunk: . settings-dialogs src
Olivier Fourdan
olivier at xfce.org
Thu Feb 5 14:06:46 CET 2009
Author: olivier
Date: 2009-02-05 13:06:46 +0000 (Thu, 05 Feb 2009)
New Revision: 29454
Modified:
xfwm4/trunk/ChangeLog
xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
xfwm4/trunk/src/events.c
xfwm4/trunk/src/moveresize.c
xfwm4/trunk/src/settings.c
Log:
* settings-dialogs/xfwm4-dialog.glade: Set minimum value for
wrap_resistance and snap_width (0 is not a valid value)
src/settings.c: clamp values to sensible defaults
src/events.c, src/moveresize.c: reduce the warping distance of the
mouse pointer (bug #3290)
Modified: xfwm4/trunk/ChangeLog
===================================================================
--- xfwm4/trunk/ChangeLog 2009-02-05 10:47:21 UTC (rev 29453)
+++ xfwm4/trunk/ChangeLog 2009-02-05 13:06:46 UTC (rev 29454)
@@ -1,3 +1,11 @@
+2009-05-01 olivier
+
+ * settings-dialogs/xfwm4-dialog.glade: Set minimum value for
+ wrap_resistance and snap_width (0 is not a valid value)
+ src/settings.c: clamp values to sensible defaults
+ src/events.c, src/moveresize.c: reduce the warping distance of the
+ mouse pointer (bug #3290)
+
2009-02-01 jannis
* NEWS: Update NEWS file.
Modified: xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade
===================================================================
--- xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2009-02-05 10:47:21 UTC (rev 29453)
+++ xfwm4/trunk/settings-dialogs/xfwm4-dialog.glade 2009-02-05 13:06:46 UTC (rev 29454)
@@ -939,7 +939,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
- <property name="adjustment">20 0 100 1 10 0</property>
+ <property name="adjustment">20 5 100 1 10 0</property>
<property name="restrict_to_fill_level">False</property>
<property name="draw_value">False</property>
</widget>
@@ -1070,7 +1070,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
- <property name="adjustment">20 0 100 1 10 0</property>
+ <property name="adjustment">20 5 100 1 10 0</property>
<property name="restrict_to_fill_level">False</property>
<property name="draw_value">False</property>
</widget>
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2009-02-05 10:47:21 UTC (rev 29453)
+++ xfwm4/trunk/src/events.c 2009-02-05 13:06:46 UTC (rev 29454)
@@ -1380,7 +1380,7 @@
&& screen_info->params->wrap_resistance)
{
int msx, msy, maxx, maxy;
- int rx, ry;
+ int rx, ry, delta;
msx = ev->x_root;
msy = ev->y_root;
@@ -1436,18 +1436,19 @@
if (edge_scroll_x > screen_info->params->wrap_resistance)
{
edge_scroll_x = 0;
+ delta = MAX (9 * maxx / 10, maxx - 5 * screen_info->params->wrap_resistance);
if (msx == 0)
{
if (workspaceMove (screen_info, 0, -1, NULL, ev->time))
{
- rx = 4 * maxx / 5;
+ rx = delta;
}
}
else
{
if (workspaceMove (screen_info, 0, 1, NULL, ev->time))
{
- rx = -4 * maxx / 5;
+ rx = -delta;
}
}
warp_pointer = TRUE;
@@ -1455,18 +1456,19 @@
if (edge_scroll_y > screen_info->params->wrap_resistance)
{
edge_scroll_y = 0;
+ delta = MAX (9 * maxy / 10, maxy - 5 * screen_info->params->wrap_resistance);
if (msy == 0)
{
if (workspaceMove (screen_info, -1, 0, NULL, ev->time))
{
- ry = 4 * maxy / 5;
+ ry = delta;
}
}
else
{
if (workspaceMove (screen_info, 1, 0, NULL, ev->time))
{
- ry = -4 * maxy / 5;
+ ry = -delta;
}
}
warp_pointer = TRUE;
Modified: xfwm4/trunk/src/moveresize.c
===================================================================
--- xfwm4/trunk/src/moveresize.c 2009-02-05 10:47:21 UTC (rev 29453)
+++ xfwm4/trunk/src/moveresize.c 2009-02-05 13:06:46 UTC (rev 29454)
@@ -552,7 +552,7 @@
gboolean moving = TRUE;
gboolean warp_pointer = FALSE;
XWindowChanges wc;
- int prev_x, prev_y;
+ int prev_x, prev_y, delta;
TRACE ("entering clientMoveEventFilter");
@@ -722,18 +722,19 @@
edge_scroll_x = 0;
if ((msx == 0) || (msx == maxx))
{
+ delta = MAX (9 * maxx / 10, maxx - 5 * screen_info->params->wrap_resistance);
if (msx == 0)
{
if (workspaceMove (screen_info, 0, -1, c, xevent->xmotion.time))
{
- rx = 4 * maxx / 5;
+ rx = delta;
}
}
else
{
if (workspaceMove (screen_info, 0, 1, c, xevent->xmotion.time))
{
- rx = -4 * maxx / 5;
+ rx = -delta;
}
}
warp_pointer = TRUE;
@@ -745,18 +746,19 @@
edge_scroll_y = 0;
if ((msy == 0) || (msy == maxy))
{
+ delta = MAX (9 * maxy / 10, maxy - 5 * screen_info->params->wrap_resistance);
if (msy == 0)
{
if (workspaceMove (screen_info, -1, 0, c, xevent->xmotion.time))
{
- ry = 4 * maxy / 5;
+ ry = delta;
}
}
else
{
if (workspaceMove (screen_info, 1, 0, c, xevent->xmotion.time))
{
- ry = -4 * maxy / 5;
+ ry = -delta;
}
}
warp_pointer = TRUE;
Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c 2009-02-05 10:47:21 UTC (rev 29453)
+++ xfwm4/trunk/src/settings.c 2009-02-05 13:06:46 UTC (rev 29454)
@@ -1085,19 +1085,19 @@
case G_TYPE_INT:
if (!strcmp (name, "raise_delay"))
{
- screen_info->params->raise_delay = g_value_get_int (value);
+ screen_info->params->raise_delay = CLAMP (g_value_get_int (value), 100, 2000);
}
else if (!strcmp (name, "focus_delay"))
{
- screen_info->params->focus_delay = g_value_get_int (value);
+ screen_info->params->focus_delay = CLAMP (g_value_get_int (value), 100, 2000);
}
else if (!strcmp (name, "snap_width"))
{
- screen_info->params->snap_width = g_value_get_int (value);
+ screen_info->params->snap_width = CLAMP (g_value_get_int (value), 5, 100);
}
else if (!strcmp (name, "wrap_resistance"))
{
- screen_info->params->wrap_resistance = g_value_get_int (value);
+ screen_info->params->wrap_resistance = CLAMP (g_value_get_int (value), 5, 100);
}
else if (!strcmp (name, "margin_left"))
{
@@ -1121,31 +1121,31 @@
}
else if (!strcmp (name, "frame_opacity"))
{
- screen_info->params->frame_opacity = g_value_get_int(value);
+ screen_info->params->frame_opacity = CLAMP (g_value_get_int(value), 0, 100);
reloadScreenSettings (screen_info, UPDATE_FRAME);
}
else if (!strcmp (name, "inactive_opacity"))
{
- screen_info->params->inactive_opacity = g_value_get_int(value);
+ screen_info->params->inactive_opacity = CLAMP (g_value_get_int(value), 0, 100);
reloadScreenSettings (screen_info, UPDATE_FRAME);
clientUpdateAllOpacity (screen_info);
}
else if (!strcmp (name, "move_opacity"))
{
- screen_info->params->move_opacity = g_value_get_int (value);
+ screen_info->params->move_opacity = CLAMP (g_value_get_int(value), 0, 100);
}
else if (!strcmp (name, "resize_opacity"))
{
- screen_info->params->resize_opacity = g_value_get_int (value);
+ screen_info->params->resize_opacity = CLAMP (g_value_get_int(value), 0, 100);
}
else if (!strcmp (name, "popup_opacity"))
{
- screen_info->params->popup_opacity = g_value_get_int (value);
+ screen_info->params->popup_opacity = CLAMP (g_value_get_int(value), 0, 100);
reloadScreenSettings (screen_info, UPDATE_FRAME);
}
else if (!strcmp (name, "placement_ratio"))
{
- screen_info->params->placement_ratio = g_value_get_int (value);
+ screen_info->params->placement_ratio = CLAMP (g_value_get_int(value), 0, 100);
}
else if ((!strcmp (name, "button_offset"))
|| (!strcmp (name, "button_spacing"))
More information about the Xfce4-commits
mailing list