callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix glib_config_args gtk_config_args confusion. (pointed out by Roland

Browse Source 
Thu Feb 18 11:46:57 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk.m4: Fix glib_config_args gtk_config_args
	  confusion. (pointed out by
	  Roland Dreier <droland@mail.math.okstate.edu>)

	* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
	  (gtk_socket_filter_func): Move the plug-socket
	  debugging code to a new "plugsocket" debug keys
	  from the previous hardcoded DPRINTF.
This commit is contained in:
Owen Taylor
1999-02-18 16:43:42 +00:00
committed by Owen Taylor
parent 63e669a75f
commit 213c516091
11 changed files with 105 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org> Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active. * gtk/gtkclist.c: added widget arg ::titles_active.

11
ChangeLog.pre-2-0
View File

@ -1,3 +1,14 @@
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org> Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active. * gtk/gtkclist.c: added widget arg ::titles_active.

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org> Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active. * gtk/gtkclist.c: added widget arg ::titles_active.

11
ChangeLog.pre-2-2
View File

@ -1,3 +1,14 @@
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org> Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active. * gtk/gtkclist.c: added widget arg ::titles_active.

11
ChangeLog.pre-2-4
View File

@ -1,3 +1,14 @@
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org> Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active. * gtk/gtkclist.c: added widget arg ::titles_active.

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org> Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active. * gtk/gtkclist.c: added widget arg ::titles_active.

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Thu Feb 18 11:46:57 1999 Owen Taylor <otaylor@redhat.com>
* gtk.m4: Fix glib_config_args gtk_config_args
confusion. (pointed out by
Roland Dreier <droland@mail.math.okstate.edu>)
* gtk/gtksocket.c gtk/gtkmain.c gtk/gtkdebug.h
(gtk_socket_filter_func): Move the plug-socket
debugging code to a new "plugsocket" debug keys
from the previous hardcoded DPRINTF.
Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org> Thu Feb 18 00:54:46 1999 Tim Janik <timj@gtk.org>
* gtk/gtkclist.c: added widget arg ::titles_active. * gtk/gtkclist.c: added widget arg ::titles_active.

2
gtk.m4
View File

@ -19,7 +19,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run
do do
case "$module" in case "$module" in
gthread) gthread)
glib_config_args="$glib_config_args gthread" gtk_config_args="$gtk_config_args gthread"
;; ;;
esac esac
done done

9
gtk/gtkdebug.h
View File

@ -24,10 +24,11 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
typedef enum { typedef enum {
GTK_DEBUG_OBJECTS = 1 << 0, GTK_DEBUG_OBJECTS = 1 << 0,
GTK_DEBUG_MISC = 1 << 1, GTK_DEBUG_MISC = 1 << 1,
GTK_DEBUG_SIGNALS = 1 << 2, GTK_DEBUG_SIGNALS = 1 << 2,
GTK_DEBUG_DND = 1 << 3 GTK_DEBUG_DND = 1 << 3,
GTK_DEBUG_PLUGSOCKET = 1 << 4
} GtkDebugFlag; } GtkDebugFlag;
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG

3
gtk/gtkmain.c
View File

@ -137,7 +137,8 @@ static const GDebugKey gtk_debug_keys[] = {
{"objects", GTK_DEBUG_OBJECTS}, {"objects", GTK_DEBUG_OBJECTS},
{"misc", GTK_DEBUG_MISC}, {"misc", GTK_DEBUG_MISC},
{"signals", GTK_DEBUG_SIGNALS}, {"signals", GTK_DEBUG_SIGNALS},
{"dnd", GTK_DEBUG_DND} {"dnd", GTK_DEBUG_DND},
{"plugsocket", GTK_DEBUG_PLUGSOCKET}
}; };
static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey); static const guint gtk_ndebug_keys = sizeof (gtk_debug_keys) / sizeof (GDebugKey);

44
gtk/gtksocket.c
View File

@ -47,14 +47,6 @@ static GdkFilterReturn gtk_socket_filter_func (GdkXEvent *gdk_xevent,
GdkEvent *event, GdkEvent *event,
gpointer data); gpointer data);
#define DEBUG_PLUGSOCKET
#ifdef DEBUG_PLUGSOCKET
#define DPRINTF(arg) g_print arg
#else
#define DPRINTF(arg)
#endif
/* From Tk */ /* From Tk */
#define EMBEDDED_APP_WANTS_FOCUS NotifyNormal+20 #define EMBEDDED_APP_WANTS_FOCUS NotifyNormal+20
@ -320,16 +312,18 @@ gtk_socket_size_allocate (GtkWidget *widget,
(allocation->height == socket->current_height)) (allocation->height == socket->current_height))
{ {
gtk_socket_send_configure_event (socket); gtk_socket_send_configure_event (socket);
DPRINTF(( "No change: %d %d\n", GTK_NOTE(PLUGSOCKET,
allocation->width, allocation->height)); g_message ("GtkSocket - allocated no change: %d %d",
allocation->width, allocation->height));
} }
else else
{ {
gdk_window_move_resize (socket->plug_window, gdk_window_move_resize (socket->plug_window,
0, 0, 0, 0,
allocation->width, allocation->height); allocation->width, allocation->height);
DPRINTF(("configuring: %d %d\n", GTK_NOTE(PLUGSOCKET,
allocation->width, allocation->height)); g_message ("GtkSocket - allocated: %d %d",
allocation->width, allocation->height));
socket->current_width = allocation->width; socket->current_width = allocation->width;
socket->current_height = allocation->height; socket->current_height = allocation->height;
} }
@ -351,8 +345,6 @@ gtk_socket_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
g_return_val_if_fail (GTK_IS_SOCKET (widget), FALSE); g_return_val_if_fail (GTK_IS_SOCKET (widget), FALSE);
socket = GTK_SOCKET (widget); socket = GTK_SOCKET (widget);
DPRINTF (( "Got focus\n"));
if (socket->focus_in && socket->plug_window) if (socket->focus_in && socket->plug_window)
XSetInputFocus (GDK_DISPLAY (), XSetInputFocus (GDK_DISPLAY (),
GDK_WINDOW_XWINDOW (socket->plug_window), GDK_WINDOW_XWINDOW (socket->plug_window),
@ -565,10 +557,11 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
socket->request_width = xcwe->width; socket->request_width = xcwe->width;
socket->request_height = xcwe->height; socket->request_height = xcwe->height;
socket->have_size = TRUE; socket->have_size = TRUE;
DPRINTF(("Window created with size: %d %d\n", GTK_NOTE(PLUGSOCKET,
socket->request_width, g_message ("GtkSocket - window created with size: %d %d",
socket->request_height)); socket->request_width,
socket->request_height));
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
} }
@ -593,9 +586,10 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
socket->request_height = xcre->height; socket->request_height = xcre->height;
socket->have_size = TRUE; socket->have_size = TRUE;
DPRINTF(("Configure request: %d %d\n", GTK_NOTE(PLUGSOCKET,
socket->request_width, g_message ("GtkSocket - configure request: %d %d",
socket->request_height)); socket->request_width,
socket->request_height));
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
} }
@ -618,8 +612,9 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
(xdwe->window == GDK_WINDOW_XWINDOW (socket->plug_window))) (xdwe->window == GDK_WINDOW_XWINDOW (socket->plug_window)))
{ {
GtkWidget *toplevel; GtkWidget *toplevel;
DPRINTF(("Destroy Notify\n")); GTK_NOTE(PLUGSOCKET,
g_message ("GtkSocket - destroy notify"));
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket)); toplevel = gtk_widget_get_toplevel (GTK_WIDGET (socket));
if (toplevel && GTK_IS_WINDOW (toplevel)) if (toplevel && GTK_IS_WINDOW (toplevel))
@ -665,7 +660,8 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
if (xevent->xmaprequest.window == if (xevent->xmaprequest.window ==
GDK_WINDOW_XWINDOW (socket->plug_window)) GDK_WINDOW_XWINDOW (socket->plug_window))
{ {
DPRINTF(("Map Request\n")); GTK_NOTE(PLUGSOCKET,
g_message ("GtkSocket - Map Request"));
gdk_window_show (socket->plug_window); gdk_window_show (socket->plug_window);