From 44d577925e0f5679d417028799db47a1f5d0fd03 Mon Sep 17 00:00:00 2001 From: Alexander Gramiak Date: Thu, 9 May 2019 17:48:55 -0600 Subject: [PATCH] Introduce Emacs_Pixmap typedef * src/dispextern.h [HAVE_X_WINDOWS]: Alias Emacs_Pixmap to Pixmap. (image, x_kill_gs_process): Use Emacs_Pixmap over Pixmap. * src/image.c: * src/nsgui.h: * src/nsterm.m: * src/termhooks.h: * src/w32gui.h: * src/w32term.c: * src/w32term.h: * src/xterm.c (x_free_pixmap): Use Emacs_Pixmap over Pixmap. * src/w32gui.h: Remove unused typedef Bitmap. --- src/dispextern.h | 7 ++++--- src/image.c | 20 +++++++++++--------- src/nsgui.h | 4 ++-- src/nsterm.m | 2 +- src/termhooks.h | 2 +- src/w32gui.h | 3 +-- src/w32term.c | 2 +- src/w32term.h | 2 +- src/xterm.c | 2 +- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/dispextern.h b/src/dispextern.h index 0acd03c0490..eecf95b54fb 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -38,6 +38,7 @@ along with GNU Emacs. If not, see . */ typedef XColor Emacs_Color; typedef Cursor Emacs_Cursor; #define No_Cursor (None) +typedef Pixmap Emacs_Pixmap; #else /* !HAVE_X_WINDOWS */ @@ -86,7 +87,7 @@ typedef HDC XImagePtr_or_DC; #define FACE_COLOR_TO_PIXEL(face_color, frame) ns_color_index_to_rgba(face_color, frame) /* Following typedef needed to accommodate the MSDOS port, believe it or not. */ typedef struct ns_display_info Display_Info; -typedef Pixmap XImagePtr; +typedef Emacs_Pixmap XImagePtr; typedef XImagePtr XImagePtr_or_DC; #else #define FACE_COLOR_TO_PIXEL(face_color, frame) face_color @@ -2960,7 +2961,7 @@ struct image struct timespec timestamp; /* Pixmaps of the image. */ - Pixmap pixmap, mask; + Emacs_Pixmap pixmap, mask; #ifdef USE_CAIRO void *cr_data; @@ -3371,7 +3372,7 @@ extern void x_create_bitmap_mask (struct frame *, ptrdiff_t); #endif extern Lisp_Object image_find_image_file (Lisp_Object); -void x_kill_gs_process (Pixmap, struct frame *); +void x_kill_gs_process (Emacs_Pixmap, struct frame *); struct image_cache *make_image_cache (void); void free_image_cache (struct frame *); void clear_image_caches (Lisp_Object); diff --git a/src/image.c b/src/image.c index c768ece9786..8e57444bb04 100644 --- a/src/image.c +++ b/src/image.c @@ -228,7 +228,7 @@ image_create_bitmap_from_data (struct frame *f, char *bits, #ifdef HAVE_NTGUI Lisp_Object frame UNINIT; /* The value is not used. */ - Pixmap bitmap; + Emacs_Pixmap bitmap; bitmap = CreateBitmap (width, height, FRAME_DISPLAY_INFO (XFRAME (frame))->n_planes, FRAME_DISPLAY_INFO (XFRAME (frame))->n_cbits, @@ -412,7 +412,8 @@ typedef void Picture; #endif static bool image_create_x_image_and_pixmap_1 (struct frame *, int, int, int, - XImagePtr *, Pixmap *, Picture *); + XImagePtr *, Emacs_Pixmap *, + Picture *); static void image_destroy_x_image (XImagePtr ximg); #ifdef HAVE_NTGUI @@ -2036,17 +2037,18 @@ image_check_image_size (XImagePtr ximg, int width, int height) } /* Create an XImage and a pixmap of size WIDTH x HEIGHT for use on - frame F. Set *XIMG and *PIXMAP to the XImage and Pixmap created. - Set (*XIMG)->data to a raster of WIDTH x HEIGHT pixels allocated - via xmalloc. Print error messages via image_error if an error - occurs. Value is true if successful. + frame F. Set *XIMG and *PIXMAP to the XImage and Emacs_Pixmap + created. Set (*XIMG)->data to a raster of WIDTH x HEIGHT pixels + allocated via xmalloc. Print error messages via image_error if an + error occurs. Value is true if successful. On W32, a DEPTH of zero signifies a 24 bit image, otherwise DEPTH should indicate the bit depth of the image. */ static bool image_create_x_image_and_pixmap_1 (struct frame *f, int width, int height, int depth, - XImagePtr *ximg, Pixmap *pixmap, Picture *picture) + XImagePtr *ximg, Emacs_Pixmap *pixmap, + Picture *picture) { #ifdef HAVE_X_WINDOWS Display *display = FRAME_X_DISPLAY (f); @@ -2256,7 +2258,7 @@ image_destroy_x_image (XImagePtr ximg) are width and height of both the image and pixmap. */ static void -gui_put_x_image (struct frame *f, XImagePtr ximg, Pixmap pixmap, +gui_put_x_image (struct frame *f, XImagePtr ximg, Emacs_Pixmap pixmap, int width, int height) { #ifdef HAVE_X_WINDOWS @@ -9539,7 +9541,7 @@ gs_load (struct frame *f, struct image *img) telling Emacs that Ghostscript has finished drawing. */ void -x_kill_gs_process (Pixmap pixmap, struct frame *f) +x_kill_gs_process (Emacs_Pixmap pixmap, struct frame *f) { struct image_cache *c = FRAME_IMAGE_CACHE (f); ptrdiff_t i; diff --git a/src/nsgui.h b/src/nsgui.h index 1a0453fa4a4..c6f0f4b0eae 100644 --- a/src/nsgui.h +++ b/src/nsgui.h @@ -96,9 +96,9 @@ typedef XGCValues * GC; #define GCFont 0x03 #ifdef __OBJC__ -typedef id Pixmap; +typedef id Emacs_Pixmap; #else -typedef void *Pixmap; +typedef void *Emacs_Pixmap; #endif #ifdef __OBJC__ diff --git a/src/nsterm.m b/src/nsterm.m index 82a0d2348ee..a927c5f6463 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -4972,7 +4972,7 @@ ns_judge_scroll_bars (struct frame *f) ========================================================================== */ static void -ns_free_pixmap (struct frame *_f, Pixmap pixmap) +ns_free_pixmap (struct frame *_f, Emacs_Pixmap pixmap) { ns_release_object (pixmap); } diff --git a/src/termhooks.h b/src/termhooks.h index 410273875a6..f1827128f19 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -744,7 +744,7 @@ struct terminal /* Image hooks */ #ifdef HAVE_WINDOW_SYSTEM /* Free the pixmap PIXMAP on F. */ - void (*free_pixmap) (struct frame *f, Pixmap pixmap); + void (*free_pixmap) (struct frame *f, Emacs_Pixmap pixmap); #endif diff --git a/src/w32gui.h b/src/w32gui.h index 81b4820becf..c8df7128a76 100644 --- a/src/w32gui.h +++ b/src/w32gui.h @@ -39,8 +39,7 @@ typedef struct _XGCValues #define GCBackground 0x02 #define GCFont 0x03 -typedef HBITMAP Pixmap; -typedef HBITMAP Bitmap; +typedef HBITMAP Emacs_Pixmap; typedef XGCValues * GC; typedef HWND Window; diff --git a/src/w32term.c b/src/w32term.c index 2be53cab894..ed881ad3beb 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6947,7 +6947,7 @@ w32_toggle_invisible_pointer (struct frame *f, bool invisible) ***********************************************************************/ static void -w32_free_pixmap (struct frame *_f, Pixmap pixmap) +w32_free_pixmap (struct frame *_f, Emacs_Pixmap pixmap) { DeleteObject (pixmap); } diff --git a/src/w32term.h b/src/w32term.h index 32c749e4874..f1373beb81c 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -56,7 +56,7 @@ extern BOOL bUseDflt; struct w32_bitmap_record { - Pixmap pixmap; + Emacs_Pixmap pixmap; char *file; HINSTANCE hinst; /* Used to load the file */ int refcount; diff --git a/src/xterm.c b/src/xterm.c index c8cddcabf5e..2de6198359c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -12161,7 +12161,7 @@ x_check_font (struct frame *f, struct font *font) ***********************************************************************/ static void -x_free_pixmap (struct frame *f, Pixmap pixmap) +x_free_pixmap (struct frame *f, Emacs_Pixmap pixmap) { XFreePixmap (FRAME_X_DISPLAY (f), pixmap); } -- 2.39.2