isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-09 18:04:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

display: Use helper function to get input events' timestamp

Browse Source
This commit is contained in:
Carlos Garnacho
2011-06-08 11:11:12 +02:00
parent e92757ac8b
commit 33c829ee39
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/display.c
View File

@@ -1729,6 +1729,7 @@ event_callback (XEvent *event,
if (meta_input_event_get_type (display, event, &evtype))
{
Window xwindow = meta_input_event_get_window (display, event);
Time evtime = meta_input_event_get_time (display, event);
if (window && !window->override_redirect &&
((evtype == KeyPress) || (evtype == ButtonPress)))
@@ -1798,8 +1799,7 @@ event_callback (XEvent *event,
meta_stack_set_positions (screen->stack,
display->grab_old_window_stacking);
}
meta_display_end_grab_op (display,
event->xbutton.time);
meta_display_end_grab_op (display, evtime);
}
else if (window && display->grab_op == META_GRAB_OP_NONE)
{
@@ -1841,7 +1841,7 @@ event_callback (XEvent *event,
meta_topic (META_DEBUG_FOCUS,
"Focusing %s due to unmodified button %u press (display.c)\n",
window->desc, event->xbutton.button);
meta_window_focus (window, event->xbutton.time);
meta_window_focus (window, evtime);
}
else
/* However, do allow terminals to lose focus due to new
@@ -1900,7 +1900,7 @@ event_callback (XEvent *event,
FALSE,
event->xbutton.button,
0,
event->xbutton.time,
evtime,
event->xbutton.x_root,
event->xbutton.y_root);
}
@@ -1913,7 +1913,7 @@ event_callback (XEvent *event,
event->xbutton.x_root,
event->xbutton.y_root,
event->xbutton.button,
event->xbutton.time);
evtime);
}
if (!frame_was_receiver && unmodified)
@@ -1941,10 +1941,10 @@ event_callback (XEvent *event,
meta_verbose ("Allowing events mode %s time %u\n",
mode == AsyncPointer ? "AsyncPointer" : "ReplayPointer",
(unsigned int)event->xbutton.time);
(unsigned int) evtime);
XAllowEvents (display->xdisplay,
mode, event->xbutton.time);
mode, evtime);
}
if (begin_move && window->has_move_func)
@@ -1957,7 +1957,7 @@ event_callback (XEvent *event,
FALSE,
event->xbutton.button,
0,
event->xbutton.time,
evtime,
event->xbutton.x_root,
event->xbutton.y_root);
}
@@ -2002,7 +2002,7 @@ event_callback (XEvent *event,
if (new_screen != NULL && display->active_screen != new_screen)
meta_workspace_focus_default_window (new_screen->active_workspace,
NULL,
event->xcrossing.time);
evtime);
}
/* Check if we've entered a window; do this even if window->has_focus to
@@ -2028,9 +2028,9 @@ event_callback (XEvent *event,
"TRUE.\n",
window->desc,
event->xany.serial,
event->xcrossing.time);
evtime);
meta_window_focus (window, event->xcrossing.time);
meta_window_focus (window, evtime);
/* stop ignoring stuff */
reset_ignored_crossing_serials (display);
@@ -2064,7 +2064,7 @@ event_callback (XEvent *event,
display->expected_focus_window->desc);
meta_display_focus_the_no_focus_window (display,
window->screen,
event->xcrossing.time);
evtime);
}
break;
case META_FOCUS_MODE_CLICK: