martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(gdpy_def): New variable.

Browse Source 
(xg_initialize): Initialize gdpy_def.
(xg_display_close): If no other display exists, set gdpy_def to a
new connection.
This commit is contained in:
Jan Djärv
2007-09-17 08:07:28 +00:00
parent 3d1634c64a
commit 879ffad913
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@@ -1,3 +1,10 @@
2007-09-17 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* gtkutil.c (gdpy_def): New variable.
(xg_initialize): Initialize gdpy_def.
(xg_display_close): If no other display exists, set gdpy_def to a
new connection.
2007-09-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* gtkutil.c (xg_get_image_for_pixmap): Always create a GdkPixbuf

19
src/gtkutil.c
View File

@@ -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 =