isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

in click-to-focus mode don't focus on enter notify. Implement unfocusing

Browse Source 
2001-12-09  Havoc Pennington  <hp@pobox.com>

	* src/display.c (event_callback): in click-to-focus mode don't
	focus on enter notify. Implement unfocusing on LeaveNotify in
	mouse focus mode. Click to focus just ends up working if we
	do nothing on enter/leave, because of the way things already
	worked. Except I need to add some relatively complex hack to
	allow clicking on client area, right now you have to click
	on the frame.
This commit is contained in:
Havoc Pennington 2001-12-10 00:38:21 +00:00 committed by Havoc Pennington
parent 6981a8198b
commit 06a0c62f86
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2001-12-09 Havoc Pennington <hp@pobox.com>
* src/display.c (event_callback): in click-to-focus mode don't
focus on enter notify. Implement unfocusing on LeaveNotify in
mouse focus mode. Click to focus just ends up working if we
do nothing on enter/leave, because of the way things already
worked. Except I need to add some relatively complex hack to
allow clicking on client area, right now you have to click
on the frame.
2001-12-09 Havoc Pennington <hp@pobox.com> 2001-12-09 Havoc Pennington <hp@pobox.com>
* src/main.c (main): move SM init a bit later in the process, and * src/main.c (main): move SM init a bit later in the process, and

32
src/display.c
View File

@ -28,6 +28,7 @@
#include "frame.h" #include "frame.h"
#include "errors.h" #include "errors.h"
#include "keybindings.h" #include "keybindings.h"
#include "prefs.h"
#include "workspace.h" #include "workspace.h"
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/cursorfont.h> #include <X11/cursorfont.h>
@ -758,7 +759,16 @@ event_callback (XEvent *event,
/* do this even if window->has_focus to avoid races */ /* do this even if window->has_focus to avoid races */
if (window && event->xany.serial != display->last_ignored_unmap_serial) if (window && event->xany.serial != display->last_ignored_unmap_serial)
{ {
meta_window_focus (window, event->xcrossing.time); switch (meta_prefs_get_focus_mode ())
{
case META_FOCUS_MODE_SLOPPY:
case META_FOCUS_MODE_MOUSE:
meta_window_focus (window, event->xcrossing.time);
break;
case META_FOCUS_MODE_CLICK:
break;
}
if (window->type == META_WINDOW_DOCK) if (window->type == META_WINDOW_DOCK)
meta_window_raise (window); meta_window_raise (window);
} }
@ -766,6 +776,26 @@ event_callback (XEvent *event,
case LeaveNotify: case LeaveNotify:
if (window) if (window)
{ {
switch (meta_prefs_get_focus_mode ())
{
case META_FOCUS_MODE_MOUSE:
/* This is kind of questionable; but we normally
* set focus to RevertToPointerRoot, so I guess
* leaving it on PointerRoot when nothing is focused
* is probably right. Anyway, unfocus the
* focused window.
*/
if (window->has_focus)
XSetInputFocus (display->xdisplay,
PointerRoot,
RevertToPointerRoot,
event->xcrossing.time);
break;
case META_FOCUS_MODE_SLOPPY:
case META_FOCUS_MODE_CLICK:
break;
}
if (window->type == META_WINDOW_DOCK) if (window->type == META_WINDOW_DOCK)
meta_window_lower (window); meta_window_lower (window);
} }