diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-09-07 21:50:20 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-09-07 21:50:20 +0000 |
commit | 1bbf2ac7ee201ea1a6a1f6307371dae86952235b (patch) | |
tree | 122a66b70762db77e892ca4b9d66278c8a5c778b /gdk/x11/gdkmain-x11.c | |
parent | f1427cd9bb2d980af72b98d6f1f1d835190edc52 (diff) | |
download | gdk-pixbuf-1bbf2ac7ee201ea1a6a1f6307371dae86952235b.tar.gz |
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.
Diffstat (limited to 'gdk/x11/gdkmain-x11.c')
-rw-r--r-- | gdk/x11/gdkmain-x11.c | 111 |
1 files changed, 63 insertions, 48 deletions
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 677a0214a..0f6476fe4 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -103,12 +103,11 @@ static const int gdk_ndebug_keys = sizeof(gdk_debug_keys)/sizeof(GDebugKey); #endif /* G_ENABLE_DEBUG */ GdkArgDesc _gdk_windowing_args[] = { - { "display", GDK_ARG_STRING, &gdk_display_name, (GdkArgFunc)NULL }, + { "display", GDK_ARG_STRING, &_gdk_display_name, (GdkArgFunc)NULL }, { "sync", GDK_ARG_BOOL, &gdk_synchronize, (GdkArgFunc)NULL }, - { "no-xshm", GDK_ARG_NOBOOL, &gdk_use_xshm, (GdkArgFunc)NULL }, - { "class", GDK_ARG_STRING, &gdk_progclass, (GdkArgFunc)NULL }, - { "gxid-host", GDK_ARG_STRING, &gdk_input_gxid_host, (GdkArgFunc)NULL }, - { "gxid-port", GDK_ARG_INT, &gdk_input_gxid_port, (GdkArgFunc)NULL }, + { "no-xshm", GDK_ARG_NOBOOL, &_gdk_use_xshm, (GdkArgFunc)NULL }, + { "gxid-host", GDK_ARG_STRING, &_gdk_input_gxid_host, (GdkArgFunc)NULL }, + { "gxid-port", GDK_ARG_INT, &_gdk_input_gxid_port, (GdkArgFunc)NULL }, { NULL } }; @@ -122,46 +121,35 @@ _gdk_windowing_init_check (int argc, char **argv) XSetErrorHandler (gdk_x_error); XSetIOErrorHandler (gdk_x_io_error); - gdk_display = XOpenDisplay (gdk_display_name); + gdk_display = XOpenDisplay (_gdk_display_name); if (!gdk_display) return FALSE; if (gdk_synchronize) XSynchronize (gdk_display, True); - gdk_screen = DefaultScreen (gdk_display); - gdk_root_window = RootWindow (gdk_display, gdk_screen); + _gdk_screen = DefaultScreen (gdk_display); + _gdk_root_window = RootWindow (gdk_display, _gdk_screen); - gdk_leader_window = XCreateSimpleWindow(gdk_display, gdk_root_window, + _gdk_leader_window = XCreateSimpleWindow(gdk_display, _gdk_root_window, 10, 10, 10, 10, 0, 0 , 0); class_hint = XAllocClassHint(); class_hint->res_name = g_get_prgname (); - if (gdk_progclass == NULL) - { - gdk_progclass = g_strdup (g_get_prgname ()); - gdk_progclass[0] = toupper (gdk_progclass[0]); - } - class_hint->res_class = gdk_progclass; - XmbSetWMProperties (gdk_display, gdk_leader_window, + class_hint->res_class = gdk_get_program_class (); + XmbSetWMProperties (gdk_display, _gdk_leader_window, NULL, NULL, argv, argc, NULL, NULL, class_hint); XFree (class_hint); pid = getpid(); - XChangeProperty (gdk_display, gdk_leader_window, + XChangeProperty (gdk_display, _gdk_leader_window, gdk_atom_intern ("_NET_WM_PID", FALSE), XA_CARDINAL, 32, PropModeReplace, (guchar *)&pid, 1); - gdk_wm_delete_window = gdk_atom_intern ("WM_DELETE_WINDOW", FALSE); - gdk_wm_take_focus = gdk_atom_intern ("WM_TAKE_FOCUS", FALSE); - gdk_wm_protocols = gdk_atom_intern ("WM_PROTOCOLS", FALSE); - gdk_wm_window_protocols[0] = gdk_wm_delete_window; - gdk_wm_window_protocols[1] = gdk_wm_take_focus; - gdk_wm_window_protocols[2] = gdk_atom_intern ("_NET_WM_PING", FALSE); - gdk_selection_property = gdk_atom_intern ("GDK_SELECTION", FALSE); - + _gdk_selection_property = gdk_atom_intern ("GDK_SELECTION", FALSE); + XGetKeyboardControl (gdk_display, &keyboard_state); autorepeat = keyboard_state.global_auto_repeat; @@ -205,13 +193,13 @@ _gdk_windowing_init_check (int argc, char **argv) void gdk_set_use_xshm (gboolean use_xshm) { - gdk_use_xshm = use_xshm; + _gdk_use_xshm = use_xshm; } gboolean gdk_get_use_xshm (void) { - return gdk_use_xshm; + return _gdk_use_xshm; } static GdkGrabStatus @@ -295,10 +283,10 @@ gdk_pointer_grab (GdkWindow * window, xevent_mask = 0; - for (i = 0; i < gdk_nevent_masks; i++) + for (i = 0; i < _gdk_nenvent_masks; i++) { if (event_mask & (1 << (i + 1))) - xevent_mask |= gdk_event_mask_table[i]; + xevent_mask |= _gdk_event_mask_table[i]; } return_val = _gdk_input_grab_pointer (window, @@ -323,7 +311,7 @@ gdk_pointer_grab (GdkWindow * window, } if (return_val == GrabSuccess) - gdk_xgrab_window = (GdkWindowObject *)window; + _gdk_xgrab_window = (GdkWindowObject *)window; return gdk_x11_convert_grab_status (return_val); } @@ -349,7 +337,7 @@ gdk_pointer_ungrab (guint32 time) _gdk_input_ungrab_pointer (time); XUngrabPointer (gdk_display, time); - gdk_xgrab_window = NULL; + _gdk_xgrab_window = NULL; } /* @@ -370,7 +358,7 @@ gdk_pointer_ungrab (guint32 time) gboolean gdk_pointer_is_grabbed (void) { - return gdk_xgrab_window != NULL; + return _gdk_xgrab_window != NULL; } /* @@ -456,7 +444,7 @@ gdk_screen_width (void) { gint return_val; - return_val = DisplayWidth (gdk_display, gdk_screen); + return_val = DisplayWidth (gdk_display, _gdk_screen); return return_val; } @@ -481,7 +469,7 @@ gdk_screen_height (void) { gint return_val; - return_val = DisplayHeight (gdk_display, gdk_screen); + return_val = DisplayHeight (gdk_display, _gdk_screen); return return_val; } @@ -506,7 +494,7 @@ gdk_screen_width_mm (void) { gint return_val; - return_val = DisplayWidthMM (gdk_display, gdk_screen); + return_val = DisplayWidthMM (gdk_display, _gdk_screen); return return_val; } @@ -531,7 +519,7 @@ gdk_screen_height_mm (void) { gint return_val; - return_val = DisplayHeightMM (gdk_display, gdk_screen); + return_val = DisplayHeightMM (gdk_display, _gdk_screen); return return_val; } @@ -563,13 +551,13 @@ gdk_set_sm_client_id (const gchar* sm_client_id) { if (sm_client_id && strcmp (sm_client_id, "")) { - XChangeProperty (gdk_display, gdk_leader_window, + XChangeProperty (gdk_display, _gdk_leader_window, gdk_atom_intern ("SM_CLIENT_ID", FALSE), XA_STRING, 8, PropModeReplace, sm_client_id, strlen(sm_client_id)); } else - XDeleteProperty (gdk_display, gdk_leader_window, + XDeleteProperty (gdk_display, _gdk_leader_window, gdk_atom_intern ("SM_CLIENT_ID", FALSE)); } @@ -580,7 +568,7 @@ gdk_beep (void) } void -gdk_windowing_exit (void) +_gdk_windowing_exit (void) { pango_x_shutdown_display (gdk_display); @@ -599,7 +587,7 @@ gdk_windowing_exit (void) * * Results: * Either we were expecting some sort of error to occur, - * in which case we set the "gdk_error_code" flag, or this + * in which case we set the "_gdk_error_code" flag, or this * error was unexpected, in which case we will print an * error message and exit. (Since trying to continue will * most likely simply lead to more errors). @@ -615,7 +603,7 @@ gdk_x_error (Display *display, { if (error->error_code) { - if (gdk_error_warnings) + if (_gdk_error_warnings) { gchar buf[64]; gchar *msg; @@ -647,7 +635,7 @@ gdk_x_error (Display *display, exit(1); #endif /* G_ENABLE_DEBUG */ } - gdk_error_code = error->error_code; + _gdk_error_code = error->error_code; } return 0; @@ -707,7 +695,7 @@ gdk_x_io_error (Display *display) gchar * gdk_get_display (void) { - return (gchar *)XDisplayName (gdk_display_name); + return (gchar *)XDisplayName (_gdk_display_name); } gint @@ -715,16 +703,16 @@ gdk_send_xevent (Window window, gboolean propagate, glong event_mask, XEvent *event_send) { Status result; - gint old_warnings = gdk_error_warnings; + gint old_warnings = _gdk_error_warnings; - gdk_error_code = 0; + _gdk_error_code = 0; - gdk_error_warnings = 0; + _gdk_error_warnings = 0; result = XSendEvent (gdk_display, window, propagate, event_mask, event_send); XSync (gdk_display, False); - gdk_error_warnings = old_warnings; + _gdk_error_warnings = old_warnings; - return result && !gdk_error_code; + return result && !_gdk_error_code; } void @@ -769,3 +757,30 @@ gdk_x11_ungrab_server (void) if (grab_count == 0) XUngrabServer (gdk_display); } + +/** + * gdk_x11_get_default_screen: + * + * Gets the default GTK+ screen number. + * + * Return value: returns the screen number specified by + * the --display command line option on the DISPLAY environment + * variable gdk_init() calls XOpenDisplay(). + **/ +gint +gdk_x11_get_default_screen (void) +{ + return _gdk_screen; +} + +Window +gdk_x11_get_default_root_xwindow (void) +{ + return _gdk_root_window; +} + +Display * +gdk_x11_get_default_xdisplay (void) +{ + return gdk_display; +} |