brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grab buttons 2 and 3 also, so you can focus a window with those, #70840

Browse Source 
002-02-08  Havoc Pennington  <hp@pobox.com>

	* src/display.c (meta_display_grab_focus_window_button): grab
	buttons 2 and 3 also, so you can focus a window with those,
	#70840
	(event_callback): fix this to let you focus a window with any
	unmodified click, and also with Alt+button1

	* configure.in (AC_OUTPUT): add po/Makefile.in

	* autogen.sh: port to glib-gettextize, remove stupid
	auto-find-subdirs crap

	* Makefile.am (SUBDIRS): add po to subdirs, #70615

	* src/window.c (meta_window_activate): unshaded window if shaded,
	I thought this was in bugzilla but I don't see it. anyway thanks
	whoever mentioned it to me.
This commit is contained in:
Havoc Pennington
2002-02-08 06:50:09 +00:00
committed by Havoc Pennington
parent ced833fdfc
commit 75fa1d1b09
19 changed files with 4067 additions and 2119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/display.c
View File

@ -735,24 +735,21 @@ event_callback (XEvent *event,
{
gboolean begin_move = FALSE;
guint grab_mask;
gboolean unmodified;
grab_mask = Mod1Mask;
if (g_getenv ("METACITY_DEBUG_BUTTON_GRABS"))
grab_mask |= ControlMask;
/* Two possible sources of an unmodified event; one is a
* client that's letting button presses pass through to the
* frame, the other is our focus_window_grab on unmodified
* button 1. So for all such events we focus the window.
*/
unmodified = (event->xbutton.state & grab_mask) == 0;
if ((event->xbutton.state & grab_mask) == 0 &&
event->xbutton.button != 1)
{
/* Two possible sources of an unmodified event;
* one is a client that's letting button presses
* pass through to the frame, the other is
* our focus_window_grab on unmodified button 1.
* In this case, we are not button 1, so we just
* ignore the whole thing.
*/
;
}
else if (event->xbutton.button == 1)
if (unmodified ||
event->xbutton.button == 1)
{
/* We always raise in click-to-focus, and
* raise only if Alt is down for sloppy/mouse
@ -760,16 +757,15 @@ event_callback (XEvent *event,
* I'm not sure I have a rationale for this.
*/
if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK ||
((event->xbutton.state & grab_mask) != 0))
!unmodified)
meta_window_raise (window);
meta_topic (META_DEBUG_FOCUS,
"Focusing %s due to button 1 press (display.c)\n",
window->desc);
"Focusing %s due to unmodified button %d press (display.c)\n",
window->desc, event->xbutton.button);
meta_window_focus (window, event->xbutton.time);
if (!frame_was_receiver &&
(event->xbutton.state & grab_mask) == 0)
if (!frame_was_receiver && unmodified)
{
/* This is from our synchronous grab since
* it has no modifiers and was on the client window
@ -799,7 +795,7 @@ event_callback (XEvent *event,
/* you can move on alt-click but not on
* the click-to-focus
*/
if ((event->xbutton.state & grab_mask) != 0)
if (!unmodified)
begin_move = TRUE;
}
else if (event->xbutton.button == 2)
@ -1958,6 +1954,7 @@ meta_display_ungrab_window_buttons (MetaDisplay *display,
}
/* Grab buttons we only grab while unfocused in click-to-focus mode */
#define MAX_FOCUS_BUTTON 4
void
meta_display_grab_focus_window_button (MetaDisplay *display,
Window xwindow)
@ -1972,7 +1969,7 @@ meta_display_grab_focus_window_button (MetaDisplay *display,
{
int i = 1;
while (i < 2)
while (i < MAX_FOCUS_BUTTON)
{
meta_change_button_grab (display,
xwindow,
@ -1991,7 +1988,7 @@ meta_display_ungrab_focus_window_button (MetaDisplay *display,
{
int i = 1;
while (i < 2)
while (i < MAX_FOCUS_BUTTON)
{
meta_change_button_grab (display, xwindow,
FALSE, TRUE, i, 0);

3
src/window.c
View File

@ -1418,6 +1418,9 @@ meta_window_activate (MetaWindow *window,
window->screen->active_workspace))
meta_window_change_workspace (window,
window->screen->active_workspace);
if (window->shaded)
meta_window_unshade (window);
if (window->minimized)
meta_window_unminimize (window);