Commit 5dd0e3d6 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Test for window == NULL in a number of cases.

Wed Apr 25 12:16:36 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
	window == NULL in a number of cases.

	* tests/testdnd.c: Set module path for gdk-pixbuf.
parent a48055e0
Wed Apr 25 12:16:36 2001 Owen Taylor <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
window == NULL in a number of cases.
* tests/testdnd.c: Set module path for gdk-pixbuf.
Thu Apr 19 16:11:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am xembed.h: File containing #defines
for XEMBED protocol.
* gtk/gtkplug.[ch] gtk/gtksocket.[ch]:
- Change protocol from old plug/socket specific protocol
to XEMBED draft
- Various fixes to work with GTK+-2.0
Still quite a bit of work to do here to handle initiation
from the socket side (as specified by XEMBED), to handle
the more advanced features of XEMBED, and to figure out
a good way to handle same-app embedding with less overhead
than using full XEMBED.
Wed Apr 18 16:04:28 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] (gtk_window_real_set_focus): Keep
track of whether the toplevel has the focus; only send
focus-in events to the focus widget when the window
actually has the focus.
2001-04-25 Havoc Pennington <hp@pobox.com>
* gtk/gtkwindow.h: set_decorations_hint and set_functions_hint
......
Wed Apr 25 12:16:36 2001 Owen Taylor <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
window == NULL in a number of cases.
* tests/testdnd.c: Set module path for gdk-pixbuf.
Thu Apr 19 16:11:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am xembed.h: File containing #defines
for XEMBED protocol.
* gtk/gtkplug.[ch] gtk/gtksocket.[ch]:
- Change protocol from old plug/socket specific protocol
to XEMBED draft
- Various fixes to work with GTK+-2.0
Still quite a bit of work to do here to handle initiation
from the socket side (as specified by XEMBED), to handle
the more advanced features of XEMBED, and to figure out
a good way to handle same-app embedding with less overhead
than using full XEMBED.
Wed Apr 18 16:04:28 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] (gtk_window_real_set_focus): Keep
track of whether the toplevel has the focus; only send
focus-in events to the focus widget when the window
actually has the focus.
2001-04-25 Havoc Pennington <hp@pobox.com>
* gtk/gtkwindow.h: set_decorations_hint and set_functions_hint
......
Wed Apr 25 12:16:36 2001 Owen Taylor <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
window == NULL in a number of cases.
* tests/testdnd.c: Set module path for gdk-pixbuf.
Thu Apr 19 16:11:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am xembed.h: File containing #defines
for XEMBED protocol.
* gtk/gtkplug.[ch] gtk/gtksocket.[ch]:
- Change protocol from old plug/socket specific protocol
to XEMBED draft
- Various fixes to work with GTK+-2.0
Still quite a bit of work to do here to handle initiation
from the socket side (as specified by XEMBED), to handle
the more advanced features of XEMBED, and to figure out
a good way to handle same-app embedding with less overhead
than using full XEMBED.
Wed Apr 18 16:04:28 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] (gtk_window_real_set_focus): Keep
track of whether the toplevel has the focus; only send
focus-in events to the focus widget when the window
actually has the focus.
2001-04-25 Havoc Pennington <hp@pobox.com>
* gtk/gtkwindow.h: set_decorations_hint and set_functions_hint
......
Wed Apr 25 12:16:36 2001 Owen Taylor <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
window == NULL in a number of cases.
* tests/testdnd.c: Set module path for gdk-pixbuf.
Thu Apr 19 16:11:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am xembed.h: File containing #defines
for XEMBED protocol.
* gtk/gtkplug.[ch] gtk/gtksocket.[ch]:
- Change protocol from old plug/socket specific protocol
to XEMBED draft
- Various fixes to work with GTK+-2.0
Still quite a bit of work to do here to handle initiation
from the socket side (as specified by XEMBED), to handle
the more advanced features of XEMBED, and to figure out
a good way to handle same-app embedding with less overhead
than using full XEMBED.
Wed Apr 18 16:04:28 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] (gtk_window_real_set_focus): Keep
track of whether the toplevel has the focus; only send
focus-in events to the focus widget when the window
actually has the focus.
2001-04-25 Havoc Pennington <hp@pobox.com>
* gtk/gtkwindow.h: set_decorations_hint and set_functions_hint
......
Wed Apr 25 12:16:36 2001 Owen Taylor <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
window == NULL in a number of cases.
* tests/testdnd.c: Set module path for gdk-pixbuf.
Thu Apr 19 16:11:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am xembed.h: File containing #defines
for XEMBED protocol.
* gtk/gtkplug.[ch] gtk/gtksocket.[ch]:
- Change protocol from old plug/socket specific protocol
to XEMBED draft
- Various fixes to work with GTK+-2.0
Still quite a bit of work to do here to handle initiation
from the socket side (as specified by XEMBED), to handle
the more advanced features of XEMBED, and to figure out
a good way to handle same-app embedding with less overhead
than using full XEMBED.
Wed Apr 18 16:04:28 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] (gtk_window_real_set_focus): Keep
track of whether the toplevel has the focus; only send
focus-in events to the focus widget when the window
actually has the focus.
2001-04-25 Havoc Pennington <hp@pobox.com>
* gtk/gtkwindow.h: set_decorations_hint and set_functions_hint
......
Wed Apr 25 12:16:36 2001 Owen Taylor <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
window == NULL in a number of cases.
* tests/testdnd.c: Set module path for gdk-pixbuf.
Thu Apr 19 16:11:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am xembed.h: File containing #defines
for XEMBED protocol.
* gtk/gtkplug.[ch] gtk/gtksocket.[ch]:
- Change protocol from old plug/socket specific protocol
to XEMBED draft
- Various fixes to work with GTK+-2.0
Still quite a bit of work to do here to handle initiation
from the socket side (as specified by XEMBED), to handle
the more advanced features of XEMBED, and to figure out
a good way to handle same-app embedding with less overhead
than using full XEMBED.
Wed Apr 18 16:04:28 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] (gtk_window_real_set_focus): Keep
track of whether the toplevel has the focus; only send
focus-in events to the focus widget when the window
actually has the focus.
2001-04-25 Havoc Pennington <hp@pobox.com>
* gtk/gtkwindow.h: set_decorations_hint and set_functions_hint
......
Wed Apr 25 12:16:36 2001 Owen Taylor <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
window == NULL in a number of cases.
* tests/testdnd.c: Set module path for gdk-pixbuf.
Thu Apr 19 16:11:07 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am xembed.h: File containing #defines
for XEMBED protocol.
* gtk/gtkplug.[ch] gtk/gtksocket.[ch]:
- Change protocol from old plug/socket specific protocol
to XEMBED draft
- Various fixes to work with GTK+-2.0
Still quite a bit of work to do here to handle initiation
from the socket side (as specified by XEMBED), to handle
the more advanced features of XEMBED, and to figure out
a good way to handle same-app embedding with less overhead
than using full XEMBED.
Wed Apr 18 16:04:28 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwindow.[ch] (gtk_window_real_set_focus): Keep
track of whether the toplevel has the focus; only send
focus-in events to the focus widget when the window
actually has the focus.
2001-04-25 Havoc Pennington <hp@pobox.com>
* gtk/gtkwindow.h: set_decorations_hint and set_functions_hint
......
......@@ -756,7 +756,8 @@ gdk_event_translate (GdkEvent *event,
xevent->xcrossing.subwindow));
/* Handle focusing (in the case where no window manager is running */
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
if (window &&
GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
xevent->xcrossing.detail != NotifyInferior &&
xevent->xcrossing.focus && !window_impl->has_focus)
{
......@@ -842,7 +843,8 @@ gdk_event_translate (GdkEvent *event,
xevent->xcrossing.detail, xevent->xcrossing.subwindow));
/* Handle focusing (in the case where no window manager is running */
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
if (window &&
GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&
xevent->xcrossing.detail != NotifyInferior &&
xevent->xcrossing.focus && !window_impl->has_focus)
{
......@@ -922,7 +924,7 @@ gdk_event_translate (GdkEvent *event,
GDK_NOTE (EVENTS,
g_message ("focus in:\t\twindow: %ld", xevent->xfocus.window));
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
if (window && GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
{
gboolean had_focus = HAS_FOCUS (window_impl);
......@@ -951,7 +953,7 @@ gdk_event_translate (GdkEvent *event,
GDK_NOTE (EVENTS,
g_message ("focus out:\t\twindow: %ld", xevent->xfocus.window));
if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
if (window && GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
{
gboolean had_focus = HAS_FOCUS (window_impl);
......@@ -1155,7 +1157,7 @@ gdk_event_translate (GdkEvent *event,
* an unmap, it means we hid the window ourselves, so we
* will have already flipped the iconified bit off.
*/
if (GDK_WINDOW_IS_MAPPED (window))
if (window && GDK_WINDOW_IS_MAPPED (window))
gdk_synthesize_window_state (window,
0,
GDK_WINDOW_STATE_ICONIFIED);
......@@ -1174,7 +1176,7 @@ gdk_event_translate (GdkEvent *event,
event->any.window = window;
/* Unset iconified if it was set */
if (((GdkWindowObject*)window)->state & GDK_WINDOW_STATE_ICONIFIED)
if (window && (((GdkWindowObject*)window)->state & GDK_WINDOW_STATE_ICONIFIED))
gdk_synthesize_window_state (window,
GDK_WINDOW_STATE_ICONIFIED,
0);
......
......@@ -551,6 +551,17 @@ source_drag_data_delete (GtkWidget *widget,
g_print ("Delete the data!\n");
}
void
test_init ()
{
if (g_file_test ("../gdk-pixbuf/.libs/libpixbufloader-pnm.so",
G_FILE_TEST_EXISTS))
{
putenv ("GDK_PIXBUF_MODULEDIR=../gdk-pixbuf/.libs");
putenv ("GTK_IM_MODULE_FILE=./gtk.immodules");
}
}
int
main (int argc, char **argv)
{
......@@ -562,6 +573,8 @@ main (int argc, char **argv)
GdkPixmap *drag_icon;
GdkPixmap *drag_mask;
test_init ();
gtk_init (&argc, &argv);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment