isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

display: Use XI2 constants for mode/detail focus event values

Browse Source 
This makes no function difference, except conceptual clarity.

https://bugzilla.gnome.org/show_bug.cgi?id=691363
This commit is contained in:
Jasper St. Pierre 2012-12-16 21:53:19 -05:00
parent e69fcc860c
commit f57d64337b
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/core/display.c
View File

@ -1894,7 +1894,7 @@ event_callback (XEvent *event,
} }
else if (input_event && else if (input_event &&
input_event->evtype == XI_Leave && input_event->evtype == XI_Leave &&
((XILeaveEvent *)input_event)->mode == NotifyUngrab && ((XILeaveEvent *)input_event)->mode == XINotifyUngrab &&
modified == display->ungrab_should_not_cause_focus_window) modified == display->ungrab_should_not_cause_focus_window)
{ {
meta_display_add_ignored_crossing_serial (display, event->xany.serial); meta_display_add_ignored_crossing_serial (display, event->xany.serial);
@ -2273,9 +2273,9 @@ event_callback (XEvent *event,
* avoid races. * avoid races.
*/ */
if (window && !crossing_serial_is_ignored (display, event->xany.serial) && if (window && !crossing_serial_is_ignored (display, event->xany.serial) &&
enter_event->mode != NotifyGrab && enter_event->mode != XINotifyGrab &&
enter_event->mode != NotifyUngrab && enter_event->mode != XINotifyUngrab &&
enter_event->detail != NotifyInferior && enter_event->detail != XINotifyInferior &&
meta_display_focus_sentinel_clear (display)) meta_display_focus_sentinel_clear (display))
{ {
switch (meta_prefs_get_focus_mode ()) switch (meta_prefs_get_focus_mode ())
@ -2320,8 +2320,8 @@ event_callback (XEvent *event,
if (window != NULL) if (window != NULL)
{ {
if (window->type == META_WINDOW_DOCK && if (window->type == META_WINDOW_DOCK &&
enter_event->mode != NotifyGrab && enter_event->mode != XINotifyGrab &&
enter_event->mode != NotifyUngrab && enter_event->mode != XINotifyUngrab &&
!window->has_focus) !window->has_focus)
meta_window_lower (window); meta_window_lower (window);
} }
@ -2364,7 +2364,7 @@ event_callback (XEvent *event,
meta_event_detail_to_string (enter_event->detail)); meta_event_detail_to_string (enter_event->detail));
if (enter_event->evtype == XI_FocusIn && if (enter_event->evtype == XI_FocusIn &&
enter_event->mode == NotifyDetailNone) enter_event->mode == XINotifyDetailNone)
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Focus got set to None, probably due to " "Focus got set to None, probably due to "
@ -2375,8 +2375,8 @@ event_callback (XEvent *event,
meta_display_get_current_time_roundtrip (display)); meta_display_get_current_time_roundtrip (display));
} }
else if (enter_event->evtype == XI_FocusIn && else if (enter_event->evtype == XI_FocusIn &&
enter_event->mode == NotifyNormal && enter_event->mode == XINotifyNormal &&
enter_event->detail == NotifyInferior) enter_event->detail == XINotifyInferior)
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Focus got set to root window, probably due to " "Focus got set to root window, probably due to "
@ -3041,29 +3041,29 @@ meta_event_detail_to_string (int d)
switch (d) switch (d)
{ {
/* We are an ancestor in the A<->B focus change relationship */ /* We are an ancestor in the A<->B focus change relationship */
case NotifyAncestor: case XINotifyAncestor:
detail = "NotifyAncestor"; detail = "NotifyAncestor";
break; break;
case NotifyDetailNone: case XINotifyDetailNone:
detail = "NotifyDetailNone"; detail = "NotifyDetailNone";
break; break;
/* We are a descendant in the A<->B focus change relationship */ /* We are a descendant in the A<->B focus change relationship */
case NotifyInferior: case XINotifyInferior:
detail = "NotifyInferior"; detail = "NotifyInferior";
break; break;
case NotifyNonlinear: case XINotifyNonlinear:
detail = "NotifyNonlinear"; detail = "NotifyNonlinear";
break; break;
case NotifyNonlinearVirtual: case XINotifyNonlinearVirtual:
detail = "NotifyNonlinearVirtual"; detail = "NotifyNonlinearVirtual";
break; break;
case NotifyPointer: case XINotifyPointer:
detail = "NotifyPointer"; detail = "NotifyPointer";
break; break;
case NotifyPointerRoot: case XINotifyPointerRoot:
detail = "NotifyPointerRoot"; detail = "NotifyPointerRoot";
break; break;
case NotifyVirtual: case XINotifyVirtual:
detail = "NotifyVirtual"; detail = "NotifyVirtual";
break; break;
} }
@ -3079,23 +3079,18 @@ meta_event_mode_to_string (int m)
const char *mode = "???"; const char *mode = "???";
switch (m) switch (m)
{ {
case NotifyNormal: case XINotifyNormal:
mode = "NotifyNormal"; mode = "NotifyNormal";
break; break;
case NotifyGrab: case XINotifyGrab:
mode = "NotifyGrab"; mode = "NotifyGrab";
break; break;
case NotifyUngrab: case XINotifyUngrab:
mode = "NotifyUngrab"; mode = "NotifyUngrab";
break; break;
/* not sure any X implementations are missing this, but case XINotifyWhileGrabbed:
* it seems to be absent from some docs.
*/
#ifdef NotifyWhileGrabbed
case NotifyWhileGrabbed:
mode = "NotifyWhileGrabbed"; mode = "NotifyWhileGrabbed";
break; break;
#endif
} }
return mode; return mode;