Author: olivier
Date: 2006-11-24 20:11:53 +0000 (Fri, 24 Nov 2006)
New Revision: 23945
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/client.h
xfwm4/trunk/src/events.c
xfwm4/trunk/src/focus.c
xfwm4/trunk/src/focus.h
Log:
Small code reorg, disable raising of windows when on FocusIn event.
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2006-11-24 19:15:11 UTC (rev 23944)
+++ xfwm4/trunk/src/client.c 2006-11-24 20:11:53 UTC (rev 23945)
@@ -23,10 +23,15 @@
#include <config.h>
#endif
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/shape.h>
+
#include <glib.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@@ -2502,6 +2507,22 @@
}
void
+clientActivate (Client * c, Time timestamp)
+{
+ ScreenInfo *screen_info;
+
+ g_return_if_fail (c != NULL);
+ TRACE ("entering clientActivate \"%s\" (0x%lx)", c->name, c->window);
+
+ screen_info = c->screen_info;
+ clientSetWorkspace (c, screen_info->current_ws, TRUE);
+ clientShow (c, TRUE);
+ clientClearAllShowDesktop (screen_info);
+ clientSetFocus (screen_info, c, timestamp, NO_FOCUS_FLAG);
+ clientRaise (c, None);
+}
+
+void
clientClose (Client * c)
{
ScreenInfo *screen_info;
Modified: xfwm4/trunk/src/client.h
===================================================================
--- xfwm4/trunk/src/client.h 2006-11-24 19:15:11 UTC (rev 23944)
+++ xfwm4/trunk/src/client.h 2006-11-24 20:11:53 UTC (rev 23945)
@@ -29,6 +29,9 @@
#include <signal.h>
#include <unistd.h>
#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xmd.h>
@@ -37,6 +40,9 @@
#include <glib.h>
#include <gtk/gtk.h>
+#include <sys/time.h>
+#include <time.h>
+
#include "screen.h"
#include "misc.h"
#include "hints.h"
@@ -340,6 +346,8 @@
int);
void clientClearAllShowDesktop (ScreenInfo *);
void clientToggleShowDesktop (ScreenInfo *);
+void clientActivate (Client *,
+ Time);
void clientClose (Client *);
void clientKill (Client *);
void clientEnterContextMenuState (Client *);
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2006-11-24 19:15:11 UTC (rev 23944)
+++ xfwm4/trunk/src/events.c 2006-11-24 20:11:53 UTC (rev 23945)
@@ -23,10 +23,15 @@
#include <config.h>
#endif
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/shape.h>
+
#include <glib.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
@@ -35,7 +40,6 @@
#include <X11/extensions/Xrandr.h>
#endif
#include <libxfce4util/libxfce4util.h>
-#include <string.h>
#include "misc.h"
#include "workspaces.h"
@@ -1677,9 +1681,12 @@
if (c)
{
TRACE ("focus set to \"%s\" (0x%lx)", c->name, c->window);
+
screen_info = c->screen_info;
clientUpdateFocus (screen_info, c, FOCUS_SORT);
+#if 0
last_raised = clientGetLastRaise (screen_info);
+
if ((screen_info->params->click_to_focus) &&
(screen_info->params->raise_on_click) &&
(last_raised != NULL) && (c != last_raised))
@@ -1690,7 +1697,7 @@
{
reset_timeout (screen_info);
}
- return;
+#endif
}
}
@@ -2052,20 +2059,12 @@
}
else
{
- clientSetWorkspace (c, screen_info->current_ws, TRUE);
- clientShow (c, TRUE);
- clientClearAllShowDesktop (screen_info);
- clientRaise (c, None);
- clientSetFocus (screen_info, c, (Time) ev_time,
NO_FOCUS_FLAG);
+ clientActivate (c, (Time) ev_time);
}
}
else
{
- clientSetWorkspace (c, screen_info->current_ws, TRUE);
- clientShow (c, TRUE);
- clientClearAllShowDesktop (screen_info);
- clientRaise (c, None);
- clientSetFocus (screen_info, c, myDisplayGetCurrentTime
(screen_info->display_info), NO_FOCUS_FLAG);
+ clientActivate (c, myDisplayGetCurrentTime
(screen_info->display_info));
}
}
else if (ev->message_type ==
display_info->atoms[NET_REQUEST_FRAME_EXTENTS])
Modified: xfwm4/trunk/src/focus.c
===================================================================
--- xfwm4/trunk/src/focus.c 2006-11-24 19:15:11 UTC (rev 23944)
+++ xfwm4/trunk/src/focus.c 2006-11-24 20:11:53 UTC (rev 23945)
@@ -23,11 +23,15 @@
#include <config.h>
#endif
+#include <sys/types.h>
+#include <sys/time.h>
+#include <time.h>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/extensions/shape.h>
-#include <sys/time.h>
+
#include <glib.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
Modified: xfwm4/trunk/src/focus.h
===================================================================
--- xfwm4/trunk/src/focus.h 2006-11-24 19:15:11 UTC (rev 23944)
+++ xfwm4/trunk/src/focus.h 2006-11-24 20:11:53 UTC (rev 23945)
@@ -25,9 +25,10 @@
# include "config.h"
#endif
-#include <glib.h>
+#include <sys/types.h>
#include <sys/time.h>
#include <time.h>
+#include <glib.h>
#include "screen.h"
#include "client.h"
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
