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

display: Replace the inline logic with a static inline

Browse Source 
So we won't get it wrong in the future.
This commit is contained in:
Jasper St. Pierre 2014-08-15 17:44:25 -04:00
parent f2283ec634
commit c3e87ee896
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/display.c
View File

@ -1167,10 +1167,16 @@ meta_get_display (void)
return the_display; return the_display;
} }
static inline gboolean
grab_op_is_window (MetaGrabOp op)
{
return GRAB_OP_GET_BASE_TYPE (op) == META_GRAB_OP_WINDOW_BASE;
}
gboolean gboolean
meta_grab_op_is_mouse (MetaGrabOp op) meta_grab_op_is_mouse (MetaGrabOp op)
{ {
if (GRAB_OP_GET_BASE_TYPE (op) != META_GRAB_OP_WINDOW_BASE) if (grab_op_is_window (op))
return FALSE; return FALSE;
return (op & META_GRAB_OP_WINDOW_FLAG_KEYBOARD) == 0; return (op & META_GRAB_OP_WINDOW_FLAG_KEYBOARD) == 0;
@ -1179,7 +1185,7 @@ meta_grab_op_is_mouse (MetaGrabOp op)
gboolean gboolean
meta_grab_op_is_keyboard (MetaGrabOp op) meta_grab_op_is_keyboard (MetaGrabOp op)
{ {
if (GRAB_OP_GET_BASE_TYPE (op) != META_GRAB_OP_WINDOW_BASE) if (grab_op_is_window (op))
return FALSE; return FALSE;
return (op & META_GRAB_OP_WINDOW_FLAG_KEYBOARD) != 0; return (op & META_GRAB_OP_WINDOW_FLAG_KEYBOARD) != 0;
@ -1188,7 +1194,7 @@ meta_grab_op_is_keyboard (MetaGrabOp op)
gboolean gboolean
meta_grab_op_is_resizing (MetaGrabOp op) meta_grab_op_is_resizing (MetaGrabOp op)
{ {
if (GRAB_OP_GET_BASE_TYPE (op) != META_GRAB_OP_WINDOW_BASE) if (grab_op_is_window (op))
return FALSE; return FALSE;
return (op & META_GRAB_OP_WINDOW_DIR_MASK) != 0; return (op & META_GRAB_OP_WINDOW_DIR_MASK) != 0;
@ -1197,7 +1203,7 @@ meta_grab_op_is_resizing (MetaGrabOp op)
gboolean gboolean
meta_grab_op_is_moving (MetaGrabOp op) meta_grab_op_is_moving (MetaGrabOp op)
{ {
if (GRAB_OP_GET_BASE_TYPE (op) != META_GRAB_OP_WINDOW_BASE) if (grab_op_is_window (op))
return FALSE; return FALSE;
return (op & META_GRAB_OP_WINDOW_DIR_MASK) == 0; return (op & META_GRAB_OP_WINDOW_DIR_MASK) == 0;