aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorAlexander Gramiak2019-05-09 09:37:50 -0600
committerAlexander Gramiak2019-05-10 17:26:12 -0600
commit616ce44ac53f08bf447cbc032f4bb10cd65c0b70 (patch)
tree99e0fca55271fabf5e81819f95c19e484a5fa90b /src/xterm.c
parent6bfc5fc6c4dfbed4b07528b64414fb04675cdf79 (diff)
downloademacs-616ce44ac53f08bf447cbc032f4bb10cd65c0b70.tar.gz
emacs-616ce44ac53f08bf447cbc032f4bb10cd65c0b70.zip
Convert Free_Pixmap macro into terminal hook
* src/termhooks.h (terminal) [HAVE_WINDOW_SYSTEM]: New terminal hook free_pixmap. * src/image.c: Replace Free_Pixmap with free_pixmap. * src/msdos.h (FRAME_X_DISPLAY): * src/nsgui.h (Display): * src/nsterm.h (FRAME_NS_DISPLAY, FRAME_X_DISPLAY, FRAME_X_SCREEN) (FRAME_X_VISUAL): * src/w32term.h (FRAME_X_DISPLAY): Remove unused X-compatibility macros and typedefs. * src/nsterm.m: * src/w32term.c: * src/xterm.c: Implement and set free_pixmap hook.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c
index bd69e6c7a82..9371d47c95e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12182,6 +12182,17 @@ x_check_font (struct frame *f, struct font *font)
12182 12182
12183 12183
12184/*********************************************************************** 12184/***********************************************************************
12185 Image Hooks
12186 ***********************************************************************/
12187
12188static void
12189x_free_pixmap (struct frame *f, Pixmap pixmap)
12190{
12191 XFreePixmap (FRAME_X_DISPLAY (f), pixmap);
12192}
12193
12194
12195/***********************************************************************
12185 Initialization 12196 Initialization
12186 ***********************************************************************/ 12197 ***********************************************************************/
12187 12198
@@ -13257,6 +13268,7 @@ x_create_terminal (struct x_display_info *dpyinfo)
13257 terminal->redeem_scroll_bar_hook = XTredeem_scroll_bar; 13268 terminal->redeem_scroll_bar_hook = XTredeem_scroll_bar;
13258 terminal->judge_scroll_bars_hook = XTjudge_scroll_bars; 13269 terminal->judge_scroll_bars_hook = XTjudge_scroll_bars;
13259 terminal->get_string_resource_hook = x_get_string_resource; 13270 terminal->get_string_resource_hook = x_get_string_resource;
13271 terminal->free_pixmap = x_free_pixmap;
13260 terminal->delete_frame_hook = x_destroy_window; 13272 terminal->delete_frame_hook = x_destroy_window;
13261 terminal->delete_terminal_hook = x_delete_terminal; 13273 terminal->delete_terminal_hook = x_delete_terminal;
13262 /* Other hooks are NULL by default. */ 13274 /* Other hooks are NULL by default. */