fix for how we read the input hint, from Hidetoshi Tajima

2002-06-04  Havoc Pennington  <hp@redhat.com>

	* src/window.c (update_wm_hints): fix for how we read the input
	hint, from Hidetoshi Tajima

	(meta_window_show): from Hidetoshi, don't autofocus windows with
	input = FALSE wm_take_focus = FALSE when they first appear. We do
	allow these windows to be focused (so keynav works), but they
	don't get focused automatically. Now how do we keep them out of
	the task list?
This commit is contained in:
Havoc Pennington 2002-06-04 22:26:52 +00:00 committed by Havoc Pennington
parent 6617781f4f
commit 7fea250304
2 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,14 @@
2002-06-04 Havoc Pennington <hp@redhat.com>
* src/window.c (update_wm_hints): fix for how we read the input
hint, from Hidetoshi Tajima
(meta_window_show): from Hidetoshi, don't autofocus windows with
input = FALSE wm_take_focus = FALSE when they first appear. We do
allow these windows to be focused (so keynav works), but they
don't get focused automatically. Now how do we keep them out of
the task list?
2002-06-04 Gustavo Giráldez <gustavo.giraldez@gmx.net> 2002-06-04 Gustavo Giráldez <gustavo.giraldez@gmx.net>
* src/theme.c (draw_op_as_pixbuf): Use icon's instead of image's * src/theme.c (draw_op_as_pixbuf): Use icon's instead of image's

View File

@ -1298,7 +1298,8 @@ meta_window_show (MetaWindow *window)
meta_display_lookup_x_window (window->display, meta_display_lookup_x_window (window->display,
window->xtransient_for); window->xtransient_for);
if (parent && parent->has_focus) if (parent && parent->has_focus &&
(window->input || window->take_focus))
{ {
meta_topic (META_DEBUG_FOCUS, meta_topic (META_DEBUG_FOCUS,
"Focusing transient window '%s' since parent had focus\n", "Focusing transient window '%s' since parent had focus\n",
@ -1309,7 +1310,8 @@ meta_window_show (MetaWindow *window)
} }
/* Always focus new windows in click-to-focus */ /* Always focus new windows in click-to-focus */
if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK) if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
(window->input || window->take_focus))
{ {
switch (window->type) switch (window->type)
{ {
@ -4032,7 +4034,7 @@ update_wm_hints (MetaWindow *window)
window->xwindow); window->xwindow);
if (hints) if (hints)
{ {
window->input = (hints->flags & InputHint) != 0; window->input = ((hints->flags & InputHint) != 0) && hints->input;
if (hints->flags & StateHint) if (hints->flags & StateHint)
window->initially_iconic = (hints->initial_state == IconicState); window->initially_iconic = (hints->initial_state == IconicState);