From 2fdb75ad450d1b190d525a4904edc91ed6074340 Mon Sep 17 00:00:00 2001 From: Rob Adams Date: Mon, 5 Jan 2004 07:24:32 +0000 Subject: Maintain the button grab for sloppy and mouse focus all the time. This 2003-01-04 Rob Adams Maintain the button grab for sloppy and mouse focus all the time. This fixes a number of problem introduced by trying to drop the grab; we now do this only for click to focus mode. This has the unfortunate effect that #102209 reappears for sloppy and mouse focus, but this seems unavoidable, because of limitations in the X protocol. See #115072. * src/display.c (meta_display_grab_focus_window_button): #if 0 the section on not grabbing unless in click-to-focus mode. * src/window.c (meta_window_notify_focus): drop focus button grab on FocusIn and acquire it on FocusOut only when in click-to-focus mode. --- src/display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/display.c') diff --git a/src/display.c b/src/display.c index ec9a864d..47fd4039 100644 --- a/src/display.c +++ b/src/display.c @@ -1371,7 +1371,7 @@ event_callback (XEvent *event, /* Raise on clicking the client area always or only * in click to focus mode? The debate rages. - * Feel free to change TRUE to FALSE + * Feel free to change TRUE to FALSE or vice versa */ if (TRUE /* meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK */) { @@ -3303,6 +3303,8 @@ meta_display_grab_focus_window_button (MetaDisplay *display, /* Grab button 1 for activating unfocused windows */ meta_verbose ("Grabbing unfocused window buttons for %s\n", window->desc); +#if 0 + /* FIXME:115072 */ /* Don't grab at all unless in click to focus mode. In click to * focus, we may sometimes be clever about intercepting and eating * the focus click. But in mouse focus, we never do that since the @@ -3314,6 +3316,7 @@ meta_display_grab_focus_window_button (MetaDisplay *display, meta_verbose (" (well, not grabbing since not in click to focus mode)\n"); return; } +#endif if (window->have_focus_click_grab) { -- cgit v1.2.1