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

We had that prev_window code in multiple places and it was all identical.

Browse Source 
2006-02-13  Elijah Newren  <newren gmail com>

	* src/keybindings.c (process_tab_grab):
	We had that prev_window code in multiple places and it was all
	identical.  Let's just stick it in one place to make the function
	easier to read.
This commit is contained in:
Elijah Newren 2006-02-13 19:26:40 +00:00 committed by Elijah Newren
parent 500bbefc6a
commit 8ceb613668
2 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-02-13 Elijah Newren <newren gmail com>
* src/keybindings.c (process_tab_grab):
We had that prev_window code in multiple places and it was all
identical. Let's just stick it in one place to make the function
easier to read.
2006-02-13 Thomas Thurman <thomas thurman org uk> 2006-02-13 Thomas Thurman <thomas thurman org uk>
* src/keybindings.c (process_tab_grab): * src/keybindings.c (process_tab_grab):

27
src/keybindings.c
View File

@ -2261,6 +2261,8 @@ process_tab_grab (MetaDisplay *display,
gboolean popup_not_showing; gboolean popup_not_showing;
gboolean backward; gboolean backward;
gboolean key_used; gboolean key_used;
Window prev_xwindow;
MetaWindow *prev_window;
if (screen != display->grab_screen) if (screen != display->grab_screen)
return FALSE; return FALSE;
@ -2313,6 +2315,8 @@ process_tab_grab (MetaDisplay *display,
if (is_modifier (display, event->xkey.keycode)) if (is_modifier (display, event->xkey.keycode))
return TRUE; return TRUE;
prev_xwindow = (Window) meta_ui_tab_popup_get_selected (screen->tab_popup);
prev_window = meta_display_lookup_x_window (display, prev_xwindow);
action = display_get_keybinding_action (display, action = display_get_keybinding_action (display,
keysym, keysym,
display->grab_mask); display->grab_mask);
@ -2348,16 +2352,8 @@ process_tab_grab (MetaDisplay *display,
/* Also, we must re-lower and re-minimize whatever window /* Also, we must re-lower and re-minimize whatever window
* we'd previously raised and unminimized. * we'd previously raised and unminimized.
*/ */
Window prev_xwindow;
MetaWindow *prev_window;
meta_stack_set_positions (screen->stack, meta_stack_set_positions (screen->stack,
screen->display->grab_old_window_stacking); screen->display->grab_old_window_stacking);
prev_xwindow =
(Window) meta_ui_tab_popup_get_selected (screen->tab_popup);
prev_window =
meta_display_lookup_x_window (display, prev_xwindow);
if (prev_window && prev_window->tab_unminimized) if (prev_window && prev_window->tab_unminimized)
{ {
meta_window_minimize (prev_window); meta_window_minimize (prev_window);
@ -2402,13 +2398,6 @@ process_tab_grab (MetaDisplay *display,
if (key_used) if (key_used)
{ {
Window prev_xwindow;
MetaWindow *prev_window;
prev_xwindow =
(Window) meta_ui_tab_popup_get_selected (screen->tab_popup);
prev_window =
meta_display_lookup_x_window (display, prev_xwindow);
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Key pressed, moving tab focus in popup\n"); "Key pressed, moving tab focus in popup\n");
@ -2452,9 +2441,6 @@ process_tab_grab (MetaDisplay *display,
} }
else else
{ {
Window prev_xwindow;
MetaWindow *prev_window;
/* end grab */ /* end grab */
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Ending tabbing/cycling, uninteresting key pressed\n"); "Ending tabbing/cycling, uninteresting key pressed\n");
@ -2464,11 +2450,6 @@ process_tab_grab (MetaDisplay *display,
meta_stack_set_positions (screen->stack, meta_stack_set_positions (screen->stack,
screen->display->grab_old_window_stacking); screen->display->grab_old_window_stacking);
prev_xwindow =
(Window) meta_ui_tab_popup_get_selected (screen->tab_popup);
prev_window =
meta_display_lookup_x_window (display, prev_xwindow);
if (prev_window && prev_window->tab_unminimized) if (prev_window && prev_window->tab_unminimized)
{ {
meta_window_minimize (prev_window); meta_window_minimize (prev_window);