Mercurial > emacs
comparison src/xterm.c @ 83275:87d0734390da
Revert changes that were committed by mistake in the previous patch.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-315
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 22 Mar 2005 17:58:23 +0000 |
parents | c22274b1aa9b |
children | 886073e54ccb |
comparison
equal
deleted
inserted
replaced
83274:c22274b1aa9b | 83275:87d0734390da |
---|---|
10768 x_delete_frame_display (struct display *display) | 10768 x_delete_frame_display (struct display *display) |
10769 { | 10769 { |
10770 struct x_display_info *dpyinfo = display->display_info.x; | 10770 struct x_display_info *dpyinfo = display->display_info.x; |
10771 int i; | 10771 int i; |
10772 | 10772 |
10773 xg_display_close (dpyinfo->display); | 10773 BLOCK_INPUT; |
10774 /* Free the fonts in the font table. */ | |
10775 for (i = 0; i < dpyinfo->n_fonts; i++) | |
10776 if (dpyinfo->font_table[i].name) | |
10777 { | |
10778 XFreeFont (dpyinfo->display, dpyinfo->font_table[i].font); | |
10779 } | |
10780 | |
10781 x_destroy_all_bitmaps (dpyinfo); | |
10782 XSetCloseDownMode (dpyinfo->display, DestroyAll); | |
10783 | |
10784 #ifdef USE_X_TOOLKIT | |
10785 XtCloseDisplay (dpyinfo->display); | |
10786 #else | |
10787 XCloseDisplay (dpyinfo->display); | |
10788 #endif | |
10774 | 10789 |
10775 x_delete_display (dpyinfo); | 10790 x_delete_display (dpyinfo); |
10791 UNBLOCK_INPUT; | |
10776 } | 10792 } |
10777 | 10793 |
10778 | 10794 |
10779 struct display * | 10795 struct display * |
10780 x_create_frame_display (struct x_display_info *dpyinfo) | 10796 x_create_frame_display (struct x_display_info *dpyinfo) |