X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/09d9db2c4921cb2eb0974892164dd03d6bffdd80..5b0d046d5b6a6743be6888d02352b878151e1d6c:/src/xterm.h diff --git a/src/xterm.h b/src/xterm.h index 15630e902e..af2e94ed11 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -158,7 +158,7 @@ struct x_display_info /* Emacs bitmap-id of the default icon bitmap for this frame. Or -1 if none has been allocated yet. */ - int icon_bitmap_id; + ptrdiff_t icon_bitmap_id; /* The root window of this screen. */ Window root_window; @@ -202,10 +202,10 @@ struct x_display_info struct x_bitmap_record *bitmaps; /* Allocated size of bitmaps field. */ - int bitmaps_size; + ptrdiff_t bitmaps_size; /* Last used bitmap index. */ - int bitmaps_last; + ptrdiff_t bitmaps_last; /* Which modifier keys are on which modifier bits? @@ -254,7 +254,7 @@ struct x_display_info Atom Xatom_CLIPBOARD, Xatom_TIMESTAMP, Xatom_TEXT, Xatom_DELETE, Xatom_COMPOUND_TEXT, Xatom_UTF8_STRING, Xatom_MULTIPLE, Xatom_INCR, Xatom_EMACS_TMP, Xatom_TARGETS, Xatom_NULL, - Xatom_ATOM_PAIR; + Xatom_ATOM, Xatom_ATOM_PAIR, Xatom_CLIPBOARD_MANAGER; /* More atoms for font properties. The last three are private properties, see the comments in src/fontset.h. */ @@ -326,8 +326,8 @@ struct x_display_info /* Atoms that are drag and drop atoms */ Atom *x_dnd_atoms; - size_t x_dnd_atoms_size; - size_t x_dnd_atoms_length; + ptrdiff_t x_dnd_atoms_size; + ptrdiff_t x_dnd_atoms_length; /* Extended window manager hints, Atoms supported by the window manager and atoms for settig the window type. */ @@ -341,7 +341,8 @@ struct x_display_info /* Atoms dealing with EWMH (i.e. _NET_...) */ Atom Xatom_net_wm_state, Xatom_net_wm_state_fullscreen, Xatom_net_wm_state_maximized_horz, Xatom_net_wm_state_maximized_vert, - Xatom_net_wm_state_sticky, Xatom_net_frame_extents; + Xatom_net_wm_state_sticky, Xatom_net_wm_state_hidden, + Xatom_net_frame_extents; /* XSettings atoms and windows. */ Atom Xatom_xsettings_sel, Xatom_xsettings_prop, Xatom_xsettings_mgr; @@ -388,7 +389,6 @@ extern struct x_display_info *x_display_list; extern Lisp_Object x_display_name_list; extern struct x_display_info *x_display_info_for_display (Display *); -extern struct x_display_info *x_display_info_for_name (Lisp_Object); extern void x_set_frame_alpha (struct frame *); extern struct x_display_info *x_term_init (Lisp_Object, char *, char *); @@ -491,7 +491,7 @@ struct x_output /* If >=0, a bitmap index. The indicated bitmap is used for the icon. */ - int icon_bitmap; + ptrdiff_t icon_bitmap; /* Default ASCII font of this frame. */ struct font *font; @@ -683,7 +683,7 @@ enum #define GDK_WINDOW_XID(w) GDK_WINDOW_XWINDOW (w) #define DEFAULT_GDK_DISPLAY() GDK_DISPLAY () #define gtk_widget_get_preferred_size(a, ign, b) \ - gtk_widget_size_request(a, b) + gtk_widget_size_request (a, b) #endif #define GTK_WIDGET_TO_X_WIN(w) \ @@ -776,8 +776,7 @@ enum struct scroll_bar { /* These fields are shared by all vectors. */ - EMACS_INT size_from_Lisp_Vector_struct; - struct Lisp_Vector *next_from_Lisp_Vector_struct; + struct vectorlike_header header; /* The window we're a scroll bar for. */ Lisp_Object window; @@ -818,12 +817,6 @@ struct scroll_bar unsigned int fringe_extended_p : 1; }; -/* The number of elements a vector holding a struct scroll_bar needs. */ -#define SCROLL_BAR_VEC_SIZE \ - ((sizeof (struct scroll_bar) \ - - sizeof (EMACS_INT) - sizeof (struct Lisp_Vector *)) \ - / sizeof (Lisp_Object)) - /* Turning a lisp vector value into a pointer to a struct scroll_bar. */ #define XSCROLL_BAR(vec) ((struct scroll_bar *) XVECTOR (vec)) @@ -956,46 +949,43 @@ XrmDatabase x_load_resources (Display *, const char *, const char *, extern int x_text_icon (struct frame *, const char *); extern int x_bitmap_icon (struct frame *, Lisp_Object); extern void x_catch_errors (Display *); -extern void x_check_errors (Display *, const char *); +extern void x_check_errors (Display *, const char *) + ATTRIBUTE_FORMAT_PRINTF (2, 0); extern int x_had_errors_p (Display *); -extern int x_catching_errors (void); extern void x_uncatch_errors (void); extern void x_clear_errors (Display *); extern void x_set_window_size (struct frame *, int, int, int); extern void x_set_mouse_position (struct frame *, int, int); extern void x_set_mouse_pixel_position (struct frame *, int, int); extern void x_ewmh_activate_frame (struct frame *); -extern void x_raise_frame (struct frame *); -extern void x_lower_frame (struct frame *); extern void x_make_frame_visible (struct frame *); extern void x_make_frame_invisible (struct frame *); extern void x_iconify_frame (struct frame *); extern void x_free_frame_resources (struct frame *); -extern void x_destroy_window (struct frame *); extern void x_wm_set_size_hint (struct frame *, long, int); -extern void x_wm_set_window_state (struct frame *, int); -extern void x_wm_set_icon_pixmap (struct frame *, int); -extern void x_delete_display (struct x_display_info *); extern void x_delete_terminal (struct terminal *terminal); -extern void x_initialize (void); extern unsigned long x_copy_color (struct frame *, unsigned long); #ifdef USE_X_TOOLKIT extern XtAppContext Xt_app_con; +extern void x_activate_timeout_atimer (void); +#endif +#ifdef USE_LUCID extern int x_alloc_lighter_color_for_widget (Widget, Display *, Colormap, unsigned long *, double, int); -extern void x_activate_timeout_atimer (void); #endif extern int x_alloc_nearest_color (struct frame *, Colormap, XColor *); extern void x_query_colors (struct frame *f, XColor *, int); extern void x_query_color (struct frame *f, XColor *); extern void x_clear_area (Display *, Window, int, int, int, int, int); +#if defined HAVE_MENUS && !defined USE_X_TOOLKIT && !defined USE_GTK extern void x_mouse_leave (struct x_display_info *); -extern void set_vertical_scroll_bar (struct window *); +#endif +#ifdef USE_X_TOOLKIT extern int x_dispatch_event (XEvent *, Display *); -extern unsigned int x_x_to_emacs_modifiers (struct x_display_info *, - unsigned); +#endif +extern int x_x_to_emacs_modifiers (struct x_display_info *, int); extern int x_display_pixel_height (struct x_display_info *); extern int x_display_pixel_width (struct x_display_info *); @@ -1030,10 +1020,12 @@ extern Lisp_Object x_property_data_to_lisp (struct frame *, Atom, int, unsigned long); +extern void x_clipboard_manager_save_frame (Lisp_Object); +extern void x_clipboard_manager_save_all (void); /* Defined in xfns.c */ -extern struct x_display_info * check_x_display_info (Lisp_Object frame); +extern struct x_display_info * check_x_display_info (Lisp_Object); extern Lisp_Object x_get_focus_frame (struct frame *); #ifdef USE_GTK @@ -1042,8 +1034,6 @@ extern int xg_set_icon_from_xpm_data (struct frame *, const char**); #endif /* USE_GTK */ extern void x_real_positions (struct frame *, int *, int *); -extern int defined_color (struct frame *, const char *, XColor *, int); -extern void x_set_border_pixel (struct frame *, int); extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); extern void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); extern void xic_free_xfontset (struct frame *); @@ -1056,24 +1046,31 @@ extern int x_pixel_width (struct frame *); extern int x_pixel_height (struct frame *); extern int x_char_width (struct frame *); extern int x_char_height (struct frame *); -extern int x_screen_planes (struct frame *); extern void x_sync (struct frame *); extern int x_defined_color (struct frame *, const char *, XColor *, int); #ifdef HAVE_X_I18N extern void free_frame_xic (struct frame *); +# if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT extern char * xic_create_fontsetname (const char *base_fontname, int motif); +# endif #endif extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); /* Defined in xfaces.c */ +#ifdef USE_X_TOOLKIT extern void x_free_dpy_colors (Display *, Screen *, Colormap, unsigned long *, int); +#endif /* USE_X_TOOLKIT */ /* Defined in xmenu.c */ +#if defined USE_GTK || defined USE_MOTIF extern void x_menu_set_in_use (int); +#endif +#ifdef USE_MOTIF extern void x_menu_wait_for_event (void *data); +#endif extern void x_activate_menubar (struct frame *); extern int popup_activated (void); extern void initialize_frame_menubar (struct frame *);