diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2007-09-17 08:07:28 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2007-09-17 08:07:28 +0000 |
| commit | 879ffad91329a32d64bcbf00eb98eb23173d1199 (patch) | |
| tree | b98a48a5dd3ae81b9c0809d0ea6245d8755c7671 /src/gtkutil.c | |
| parent | 3d1634c64adf1e62d51e050e3300e682d2e20790 (diff) | |
| download | emacs-879ffad91329a32d64bcbf00eb98eb23173d1199.tar.gz | |
(gdpy_def): New variable.
(xg_initialize): Initialize gdpy_def.
(xg_display_close): If no other display exists, set gdpy_def to a
new connection.
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index b37620caa9c..81ef09b7ec4 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -51,6 +51,13 @@ Boston, MA 02110-1301, USA. */ #ifdef HAVE_GTK_MULTIDISPLAY +/* Gtk does not work well without any display open. Emacs may close + all its displays. In that case, keep a display around just for + the purpose of having one. */ + +static GdkDisplay *gdpy_def; + + /* Return the GdkDisplay that corresponds to the X display DPY. */ static GdkDisplay * @@ -147,9 +154,15 @@ xg_display_close (Display *dpy) break; } - if (! new_dpy) return; /* Emacs will exit anyway. */ + if (new_dpy) + gdpy_new = gdk_x11_lookup_xdisplay (new_dpy); + else + { + if (!gdpy_def) + gdpy_def = gdk_display_open (gdk_display_get_name (gdpy)); + gdpy_new = gdpy_def; + } - gdpy_new = gdk_x11_lookup_xdisplay (new_dpy); gdk_display_manager_set_default_display (gdk_display_manager_get (), gdpy_new); } @@ -4091,6 +4104,8 @@ xg_initialize () we keep it permanently linked in. */ XftInit (0); #endif + + gdpy_def = NULL; xg_ignore_gtk_scrollbar = 0; xg_detached_menus = 0; xg_menu_cb_list.prev = xg_menu_cb_list.next = |