Author: olivier
Date: 2008-05-27 16:58:58 +0000 (Tue, 27 May 2008)
New Revision: 26996
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/events.c
Log:
Revert previous change, not much of a good idea, usability wise
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2008-05-27 09:08:23 UTC (rev 26995)
+++ xfwm4/trunk/src/client.c 2008-05-27 16:58:58 UTC (rev 26996)
@@ -5479,12 +5479,10 @@
screen_info = c->screen_info;
-#ifdef WIN_BUTTON_RAISE
if (state == INACTIVE)
{
return (state);
}
-#endif /* WIN_BUTTON_RAISE */
if ((c->button_status[button] == BUTTON_STATE_PRESSED) &&
clientGetButtonPixmap (c, button, PRESSED))
@@ -5498,7 +5496,7 @@
return (PRELIGHT);
}
- return (state);
+ return (ACTIVE);
}
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2008-05-27 09:08:23 UTC (rev 26995)
+++ xfwm4/trunk/src/events.c 2008-05-27 16:58:58 UTC (rev 26996)
@@ -913,7 +913,6 @@
{
if (ev->button <= Button3)
{
-#ifdef WIN_BUTTON_RAISE
if (!(c->type & WINDOW_TYPE_DONT_FOCUS))
{
clientSetFocus (screen_info, c, ev->time, NO_FOCUS_FLAG);
@@ -923,7 +922,6 @@
clientClearDelayedRaise ();
clientRaise (c, None);
}
-#endif /* WIN_BUTTON_RAISE */
clientButtonPress (c, win, ev);
}
}
@@ -952,7 +950,6 @@
}
else if (tclick != XFWM_BUTTON_UNDEFINED)
{
-#ifdef WIN_BUTTON_RAISE
if (!(c->type & WINDOW_TYPE_DONT_FOCUS))
{
clientSetFocus (screen_info, c, ev->time,
NO_FOCUS_FLAG);
@@ -962,7 +959,6 @@
clientClearDelayedRaise ();
clientRaise (c, None);
}
-#endif /* WIN_BUTTON_RAISE */
ev->window = ev->root;
if (screen_info->button_handler_id)
{
@@ -1532,10 +1528,8 @@
clientClearDelayedFocus ();
}
}
-#ifdef WIN_BUTTON_RAISE
if (c == clientGetFocus ())
{
-#endif /* WIN_BUTTON_RAISE */
for (b = 0; b < BUTTON_COUNT; b++)
{
if (MYWINDOW_XWINDOW(c->buttons[b]) == ev->window)
@@ -1551,9 +1545,7 @@
{
frameQueueDraw (c, FALSE);
}
-#ifdef WIN_BUTTON_RAISE
}
-#endif /* WIN_BUTTON_RAISE */
/* No need to process the event any further */
return EVENT_FILTER_REMOVE;
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
