Make gdkx.h the only installed header from gdk/x11. All structures in

Fri Sep  7 11:51:44 2001  Owen Taylor  <otaylor@redhat.com>

      Make gdkx.h the only installed header from gdk/x11.
      All structures in gdk/x11 are opaque.

	* gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h:
	Don't install gdk{drawable,pixmap,window}-x11.h.

	* gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c:
	Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11,
	GdkVisualClass into C files.

	* gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static.

	* gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c,
	gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c}
	Add public functions to replace previously exported direct
	structure access.
	gdk_x11_colormap_get_{xdisplay,xcolormap}
	gdk_x11_cursor_get_{xdisplay,xcursor},
	gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual,
	gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage},
	gdk_x11_gc_get_{xdisplay,ximage}

	* gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo,
	GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals.

      Fix a number of variables and functions that were exported
      "accidentally" from GDK.

	* gdk/**.[ch]: gdk => _gdk for gdk_visual_init,
	gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit,
	gdk_input_exit,	gdk_windowing_exit, gdk_event_func, gdk_event_data,
	gdk_event_notify, gdk_queued_events, gdk_queued_tail,
	gdk_event_new, gdk_events_queue, gdk_events_unqueue,
	gdk_event_queue_find_first, gdk_event_queue_remove_link,
	gdk_event_queue_append, gdk_event_button_generate,
	gdk_debug_flags, gdk_default_filters, gdk_parent_root.

	* gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c,
	   gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}:
	gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks,
	gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window,
	gdk_use_xshm, gdk_input_ignore_core.

	* gdk/x11/xsettings-common.h (xsettings_list_insert): Add
	#defines to namespace functions into the private _gdk_
	namespace.

	* gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window ()
	to replace gdk_parent_root exported variable. Adjust and
	deprecate GDK_ROOT_PARENT().

	* demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix
	GDK_ROOT_PARENT usage, remove includes of port-specific
	headers.

	* gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for
	_gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core,
	gdk_input_devices, _gdk_input_windows, gdk_init_input_core.

	* gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c}
	docs/Changes-2.0.txt: Remove gdk_wm_protocols,
	gdk_wm_delete_window functions, gdk_wm_take_focus,
	use gdk_atom_intern() instead.

	* gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h}
	  gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h}
	  gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h}
	  gtk/gtkselection.c
        Unexport gdk_selection_property, just use
	gdk_atom_intern ("GDK_SELECTION").

	* gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}:
	Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type,
	GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate,
	GdkVisualprivate, gdk_x11_gc_flush.

      Make a number of public exports of variables into functions
      to increase encapsulation.

	* gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h
	gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer,
	move to gdkinternals.h. Add gdk_device_get_core_pointer ().

	* gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h
	docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code,
	gdk_error_warnings.

	* gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h}
	  docs/Changes-2.0.txt:
	s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen()
	s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow()
	Add gdk_x11_get_default_xdisplay().

	* gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c
	win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c
	gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class,
	Don't export gdk_progclass, move --class command line
	option and handling to common portion of GDK.

      Miscellaneous fixes:

	* gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix
	g_return_val_if_fail that should have been g_return_if_fail.

	* gdk/gdkinternals.h gdk/gdkprivate.h: Move
	gdk_synthesize_window_state() to the semi-public gdkprivate.h.

	* gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded
	X11 dependency.

	* gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO:
	Remove unused gdk_key_repeat_disable/restore.

	* linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c
	x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def:
	Remove unused gdk_null_window_warnings variable.

	* gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox;
	it can be retrieved from the repository; it is too far
	from functional to be worth having people check out;
	it would be easier to start from scratch, I suspect.

	* gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID().

	* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
	gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
	Fix some accidentally global variables and unused global variables.

	* gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c
	gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c:
	Fix some accidentally global variables and unused global variables.

      Add some space for future expansion to multihead.

	* gdk/gdkdrawable.h: Add four reserved function pointers
	for future expansion of GdkDrawableClass.

	* gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer
	where we can put a GdkScreen * later.

9 files changed, 15 insertions, 30 deletions

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index d78688cc07..f61ae769f2 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -26,16 +26,6 @@
 
 #include "gdkconfig.h"
 
-#if defined (GDK_WINDOWING_X11)
-#include "x11/gdkx.h"
-#elif defined (GDK_WINDOWING_WIN32)
-#include "win32/gdkwin32.h"
-#elif defined(GDK_WINDOWING_FB)
-#include "linux-fb/gdkfb.h"
-#elif defined (GDK_WINDOWING_NANOX)
-#include "nanox/gdkprivate-nanox.h"
-#endif
-
 #include "gdk/gdkkeysyms.h"
 
 #include "gtkdnd.h"
@@ -2398,19 +2388,12 @@ _gtk_drag_source_handle_event (GtkWidget *widget,
 	    cursor = gtk_drag_get_cursor (event->dnd.context->action);
 	    if (info->cursor != cursor)
 	      {
-#ifdef GDK_WINDOWING_X11
-		XChangeActivePointerGrab (GDK_WINDOW_XDISPLAY (widget->window), 
-					  PointerMotionMask | PointerMotionHintMask | ButtonReleaseMask,
-					  ((GdkCursorPrivate *)cursor)->xcursor,
-					  event->dnd.time);
-#elif defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_FB)
 		gdk_pointer_grab (widget->window, FALSE,
 				  GDK_POINTER_MOTION_MASK |
 				  GDK_POINTER_MOTION_HINT_MASK |
 				  GDK_BUTTON_RELEASE_MASK,
 				  NULL,
 				  cursor, event->dnd.time);
-#endif
 		info->cursor = cursor;
 	      }
 	    
@@ -2986,7 +2969,7 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
   send_event.button.axes = NULL;
   send_event.button.state = 0;
   send_event.button.button = info->button;
-  send_event.button.device = gdk_core_pointer;
+  send_event.button.device = gdk_device_get_core_pointer ();
   send_event.button.x_root = 0;
   send_event.button.y_root = 0;
 
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index 70a79ae5de..b35999a986 100644
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -199,7 +199,7 @@ gtk_input_dialog_init (GtkInputDialog *inputd)
 
       for (tmp_list = device_info; tmp_list; tmp_list = tmp_list->next) {
 	GdkDevice *info = (GdkDevice *)(tmp_list->data);
-	if (info != gdk_core_pointer)
+	if (info != gdk_device_get_core_pointer ())
 	  {
 	    menuitem = gtk_menu_item_new_with_label(info->name);
 
diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
index 4ab0335239..27516e493d 100644
--- a/gtk/gtkinvisible.h
+++ b/gtk/gtkinvisible.h
@@ -49,6 +49,7 @@ struct _GtkInvisible
 {
   GtkWidget widget;
   gboolean has_user_ref_count;
+  gpointer gtk_reserved1;	/* For future GdkScreen * */
 };
 
 struct _GtkInvisibleClass
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index bb81a3acf9..2ebbb784ce 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -580,7 +580,7 @@ gtk_plug_forward_key_press (GtkPlug *plug, GdkEventKey *event)
   xevent.xkey.same_screen = TRUE; /* FIXME ? */
 
   gdk_error_trap_push ();
-  XSendEvent (gdk_display,
+  XSendEvent (GDK_DISPLAY (),
 	      GDK_WINDOW_XWINDOW (plug->socket_window),
 	      False, NoEventMask, &xevent);
   gdk_flush ();
@@ -610,7 +610,7 @@ gtk_plug_set_focus (GtkWindow *window,
       xevent.xfocus.detail = FALSE; /* Don't force */
 
       gdk_error_trap_push ();
-      XSendEvent (gdk_display,
+      XSendEvent (GDK_DISPLAY (),
 		  GDK_WINDOW_XWINDOW (plug->socket_window),
 		  False, NoEventMask, &xevent);
       gdk_flush ();
@@ -857,7 +857,7 @@ send_xembed_message (GtkPlug *plug,
       xevent.xclient.data.l[4] = data2;
 
       gdk_error_trap_push ();
-      XSendEvent (gdk_display,
+      XSendEvent (GDK_DISPLAY (),
 		  GDK_WINDOW_XWINDOW (plug->socket_window),
 		  False, NoEventMask, &xevent);
       gdk_flush ();
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 4f93f6b65d..0e670919a4 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1439,7 +1439,7 @@ gtk_selection_property_notify (GtkWidget	*widget,
 
 #if defined(GDK_WINDOWING_WIN32) || defined(GDK_WINDOWING_X11)
   if ((event->state != GDK_PROPERTY_NEW_VALUE) ||  /* property was deleted */
-      (event->atom != gdk_selection_property)) /* not the right property */
+      (event->atom != gdk_atom_intern ("GDK_SELECTION", FALSE))) /* not the right property */
 #endif
     return FALSE;
   
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index d5ca43e892..a1ff7226b4 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -705,7 +705,7 @@ gtk_socket_key_press_event (GtkWidget   *widget,
       xevent.xkey.same_screen = TRUE; /* FIXME ? */
       
       gdk_error_trap_push ();
-      XSendEvent (gdk_display,
+      XSendEvent (GDK_DISPLAY (),
 		  GDK_WINDOW_XWINDOW (socket->plug_window),
 		  False, NoEventMask, &xevent);
       gdk_flush ();
@@ -880,7 +880,7 @@ gtk_socket_focus (GtkWidget *widget, GtkDirectionType direction)
 
 
       gdk_error_trap_push ();
-      XSendEvent (gdk_display,
+      XSendEvent (GDK_DISPLAY (),
 		  GDK_WINDOW_XWINDOW (socket->plug_window),
 		  False, NoEventMask, &xevent);
       gdk_flush();
@@ -926,7 +926,7 @@ gtk_socket_send_configure_event (GtkSocket *socket)
   g_return_if_fail (socket->plug_window != NULL);
 
   event.xconfigure.type = ConfigureNotify;
-  event.xconfigure.display = gdk_display;
+  event.xconfigure.display = GDK_DISPLAY ();
 
   event.xconfigure.event = GDK_WINDOW_XWINDOW (socket->plug_window);
   event.xconfigure.window = GDK_WINDOW_XWINDOW (socket->plug_window);
@@ -941,7 +941,7 @@ gtk_socket_send_configure_event (GtkSocket *socket)
   event.xconfigure.override_redirect = False;
 
   gdk_error_trap_push ();
-  XSendEvent (gdk_display,
+  XSendEvent (GDK_DISPLAY (),
 	      GDK_WINDOW_XWINDOW (socket->plug_window),
 	      False, NoEventMask, &event);
   gdk_flush ();
@@ -1087,7 +1087,7 @@ send_xembed_message (GtkSocket *socket,
       xevent.xclient.data.l[4] = data2;
 
       gdk_error_trap_push ();
-      XSendEvent (gdk_display,
+      XSendEvent (GDK_DISPLAY (),
 		  GDK_WINDOW_XWINDOW (socket->plug_window),
 		  False, NoEventMask, &xevent);
       gdk_flush ();
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 81ed3aa897..2ed597fe57 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5468,7 +5468,7 @@ _gtk_tree_view_column_start_drag (GtkTreeView       *tree_view,
   send_event.button.axes = NULL;
   send_event.button.state = 0;
   send_event.button.button = 1;
-  send_event.button.device = gdk_core_pointer;
+  send_event.button.device = gdk_device_get_core_pointer ();
   send_event.button.x_root = 0;
   send_event.button.y_root = 0;
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 46f8d2491b..eab6decbac 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -585,7 +585,7 @@ gtk_window_init (GtkWindow *window)
 
   window->title = NULL;
   window->wmclass_name = g_strdup (g_get_prgname ());
-  window->wmclass_class = g_strdup (gdk_progclass);
+  window->wmclass_class = g_strdup (gdk_get_program_class ());
   window->wm_role = NULL;
   window->geometry_info = NULL;
   window->type = GTK_WINDOW_TOPLEVEL;
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 2f74744251..32ce21d337 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -106,6 +106,7 @@ struct _GtkWindow
   guint frame_bottom;
   
   GdkModifierType mnemonic_modifier;
+  gpointer gtk_reserved1;	/* For future GdkScreen * */
 };
 
 struct _GtkWindowClass