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

window: Fix coding style in meta_window_unqueue()

Browse Source 
As with meta_window_queue(), it had some comments duplicating code, so
those were removed too to increase readability.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2264>
This commit is contained in:
Jonas Ådahl 2022-01-29 00:21:59 +01:00 committed by Marge Bot
parent aeae90d5d9
commit ac5d728abd
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/window.c
View File

@ -133,7 +133,8 @@ static void ensure_mru_position_after (MetaWindow *window,
static void meta_window_move_resize_now (MetaWindow *window); static void meta_window_move_resize_now (MetaWindow *window);
static void meta_window_unqueue (MetaWindow *window, guint queuebits); static void meta_window_unqueue (MetaWindow *window,
MetaQueueType queuebits);
static void update_move (MetaWindow *window, static void update_move (MetaWindow *window,
MetaEdgeResistanceFlags flags, MetaEdgeResistanceFlags flags,
@ -1967,15 +1968,15 @@ static const gchar* meta_window_queue_names[NUMBER_OF_QUEUES] =
#endif #endif
static void static void
meta_window_unqueue (MetaWindow *window, guint queuebits) meta_window_unqueue (MetaWindow *window,
MetaQueueType queuebits)
{ {
gint queuenum; int queuenum;
for (queuenum = 0; queuenum < NUMBER_OF_QUEUES; queuenum++) for (queuenum = 0; queuenum < NUMBER_OF_QUEUES; queuenum++)
{ {
if ((queuebits & 1<<queuenum) /* they have asked to unqueue */ if ((queuebits & 1 << queuenum) &&
&& (window->is_in_queues & 1 << queuenum))
(window->is_in_queues & 1<<queuenum)) /* it's in the queue */
{ {
meta_topic (META_DEBUG_WINDOW_STATE, meta_topic (META_DEBUG_WINDOW_STATE,
@ -1983,16 +1984,9 @@ meta_window_unqueue (MetaWindow *window, guint queuebits)
window->desc, window->desc,
meta_window_queue_names[queuenum]); meta_window_queue_names[queuenum]);
/* Note that window may not actually be in the queue
* because it may have been in "copy" inside the idle handler
*/
queue_pending[queuenum] = g_slist_remove (queue_pending[queuenum], window); queue_pending[queuenum] = g_slist_remove (queue_pending[queuenum], window);
window->is_in_queues &= ~(1 << queuenum); window->is_in_queues &= ~(1 << queuenum);
/* Okay, so maybe we've used up all the entries in the queue.
* In that case, we should kill the function that deals with
* the queue, because there's nothing left for it to do.
*/
if (queue_pending[queuenum] == NULL && queue_later[queuenum] != 0) if (queue_pending[queuenum] == NULL && queue_later[queuenum] != 0)
{ {
meta_later_remove (queue_later[queuenum]); meta_later_remove (queue_later[queuenum]);