X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bf3382455daea12282d128912aaeb0d570664f65..3c9dc1cf0d6be64608cd309ad042d74e4fc02049:/src/xterm.h diff --git a/src/xterm.h b/src/xterm.h index 9e8779bf55..47be04e0fb 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -30,13 +30,25 @@ Boston, MA 02111-1307, USA. */ #include #include /* CoreP.h needs this */ #include /* foul, but we need this to use our own - window inside a widget instead of one + window inside a widget instead of one that Xt creates... */ #include + +typedef Widget xt_or_gtk_widget; #endif -/* The class of this X application. */ -#define EMACS_CLASS "Emacs" +#ifdef USE_GTK +#include +#include + +/* Some definitions to reduce conditionals. */ +typedef GtkWidget *xt_or_gtk_widget; +#define XtParent(x) (gtk_widget_get_parent (x)) +#undef XSync +#define XSync(d, b) gdk_window_process_all_updates () + +#endif /* USE_GTK */ + /* Bookkeeping to distinguish X versions. */ @@ -65,7 +77,7 @@ Boston, MA 02111-1307, USA. */ #ifdef PBaseSize /* AIX 3.1's X is somewhere between X11R3 and X11R4. It has PBaseSize, but not XWithdrawWindow, XSetWMName, XSetWMNormalHints, - XSetWMIconName. + XSetWMIconName. AIX 3.2 is at least X11R4. */ #if (!defined AIX) || (defined AIX3_2) #define HAVE_X11R4 @@ -90,6 +102,7 @@ Boston, MA 02111-1307, USA. */ #define FONT_WIDTH(f) ((f)->max_bounds.width) #define FONT_HEIGHT(f) ((f)->ascent + (f)->descent) #define FONT_BASE(f) ((f)->ascent) +#define FONT_DESCENT(f) ((f)->descent) /* The mask of events that text windows always want to receive. This includes mouse movement events, since handling the mouse-font text property @@ -126,51 +139,51 @@ struct x_display_info { /* Chain of all x_display_info structures. */ struct x_display_info *next; - + /* Connection number (normally a file descriptor number). */ int connection; - + /* This says how to access this display in Xlib. */ Display *display; - + /* This is a cons cell of the form (NAME . FONT-LIST-CACHE). The same cons cell also appears in x_display_name_list. */ Lisp_Object name_list_element; - + /* Number of frames that are on this display. */ int reference_count; - + /* The Screen this connection is connected to. */ Screen *screen; /* Dots per inch of the screen. */ double resx, resy; - + /* The Visual being used for this display. */ Visual *visual; /* The colormap being used. */ Colormap cmap; - + /* Number of panes on this screen. */ int n_planes; - + /* Dimensions of this screen. */ int height, width; - + /* Mask of things that cause the mouse to be grabbed. */ int grabbed; - + /* Emacs bitmap-id of the default icon bitmap for this frame. Or -1 if none has been allocated yet. */ int icon_bitmap_id; - + /* The root window of this screen. */ Window root_window; - + /* The cursor to use for vertical scroll bars. */ Cursor vertical_scroll_bar_cursor; - + /* X Resource data base */ XrmDatabase xrdb; @@ -262,19 +275,19 @@ struct x_display_info /* Communication with window managers. */ Atom Xatom_wm_protocols; - + /* Kinds of protocol things we may receive. */ Atom Xatom_wm_take_focus; Atom Xatom_wm_save_yourself; Atom Xatom_wm_delete_window; - + /* Atom for indicating window state to the window manager. */ Atom Xatom_wm_change_state; - + /* Other WM communication */ Atom Xatom_wm_configure_denied; /* When our config request is denied */ Atom Xatom_wm_window_moved; /* When the WM moves us. */ - + /* EditRes protocol */ Atom Xatom_editres; @@ -343,12 +356,17 @@ struct x_display_info int ncolor_cells; }; +#ifdef HAVE_X_I18N +/* Whether or not to use XIM if we have it. */ +extern int use_xim; +#endif + /* This checks to make sure we have a display. */ extern void check_x P_ ((void)); extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); -#ifdef USE_X_TOOLKIT +#if defined (USE_X_TOOLKIT) || defined (USE_GTK) extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int)); extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); @@ -387,24 +405,15 @@ extern void x_find_ccl_program P_ ((struct font_info *)); struct x_output { - /* Position of the X window (x and y offsets in root window). */ - int left_pos; - int top_pos; - - /* Border width of the X window as known by the X window system. */ - int border_width; - - /* Size of the X window in pixels. */ - int pixel_height, pixel_width; - /* Height of menu bar widget, in pixels. Zero if not using the X toolkit. When using the toolkit, this value is not meaningful if the menubar is turned off. */ int menubar_height; - /* Height of a line, in pixels. */ - int line_height; + /* Height of tool bar widget, in pixels. + Zero if not using an external tool bar. */ + int toolbar_height; /* The tiled border used when the mouse is out of the frame. */ Pixmap border_tile; @@ -414,11 +423,6 @@ struct x_output GC reverse_gc; /* Reverse video */ GC cursor_gc; /* cursor drawing */ - /* Width of the internal border. This is a line of background color - just inside the window's border. When the frame is selected, - a highlighting is displayed inside the internal border. */ - int internal_border_width; - /* The X window used for this frame. May be zero while the frame object is being created and the X window has not yet been created. */ @@ -446,6 +450,26 @@ struct x_output Widget menubar_widget; #endif +#ifdef USE_GTK + /* The widget of this screen. This is the window of a top widget. */ + GtkWidget *widget; + /* The widget of the edit portion of this screen; the window in + "window_desc" is inside of this. */ + GtkWidget *edit_widget; + /* The widget used for laying out widgets vertically. */ + GtkWidget *vbox_widget; + /* The menubar in this frame. */ + GtkWidget *menubar_widget; + /* The tool bar in this frame */ + GtkWidget *toolbar_widget; + /* The handle box that makes the tool bar detachable. */ + GtkWidget *handlebox_widget; + + /* The last size hints set. */ + GdkGeometry size_hints; + long hint_flags; +#endif + /* If >=0, a bitmap index. The indicated bitmap is used for the icon. */ int icon_bitmap; @@ -472,7 +496,7 @@ struct x_output /* Foreground color for scroll bars. A value of -1 means use the default (black for non-toolkit scroll bars). */ unsigned long scroll_bar_foreground_pixel; - + /* Background color for scroll bars. A value of -1 means use the default (background color of the frame for non-toolkit scroll bars). */ @@ -487,14 +511,14 @@ struct x_output Cursor text_cursor; Cursor nontext_cursor; Cursor modeline_cursor; - Cursor cross_cursor; + Cursor hand_cursor; Cursor hourglass_cursor; Cursor horizontal_drag_cursor; /* Window whose cursor is hourglass_cursor. This window is temporarily mapped to display an hourglass cursor. */ Window hourglass_window; - + /* Non-zero means hourglass cursor is currently displayed. */ unsigned hourglass_p : 1; @@ -514,22 +538,6 @@ struct x_output to the mask as we go. */ XWMHints wm_hints; - /* The size of the extra width currently allotted for vertical - scroll bars, in pixels. */ - int vertical_scroll_bar_extra; - - /* The extra width currently allotted for the areas in which - truncation marks, continuation marks, and overlay arrows are - displayed. */ - int left_fringe_width, right_fringe_width; - int fringe_cols, fringes_extra; - - /* This is the gravity value for the specified window position. */ - int win_gravity; - - /* The geometry flags for this window. */ - int size_hint_flags; - /* This is the Emacs structure for the X display this frame is on. */ struct x_display_info *display_info; @@ -579,21 +587,10 @@ struct x_output zero, tell Xt not to wait. */ int wait_for_wm; - /* See enum below */ - int want_fullscreen; - - /* This many pixels are the difference between the outer window (i.e. the - left of the window manager decoration) and FRAME_X_WINDOW. */ - int x_pixels_diff; - - /* This many pixels are the difference between the outer window (i.e. the - top of the window manager titlebar) and FRAME_X_WINDOW. */ - int y_pixels_diff; - /* As x_pixels_diff, but to FRAME_OUTER_WINDOW. For some reason the two might differ by a pixel, depending on WM */ int x_pixels_outer_diff; - + /* As y_pixels_diff, but to FRAME_OUTER_WINDOW. In the toolkit version, these may differ because this does not take into account possible menubar. y_pixels_diff is with menubar height included */ @@ -605,16 +602,7 @@ struct x_output int focus_state; }; -enum -{ - /* Values used as a bit mask, BOTH == WIDTH | HEIGHT. */ - FULLSCREEN_NONE = 0, - FULLSCREEN_WIDTH = 1, - FULLSCREEN_HEIGHT = 2, - FULLSCREEN_BOTH = 3, - FULLSCREEN_WAIT = 4, - FULLSCREEN_MOVE_WAIT = 8, -}; +#define No_Cursor (None) enum { @@ -629,6 +617,9 @@ enum }; +/* Return the X output data for frame F. */ +#define FRAME_X_OUTPUT(f) ((f)->output_data.x) + /* Return the X window used for displaying data in frame F. */ #define FRAME_X_WINDOW(f) ((f)->output_data.x->window_desc) @@ -638,18 +629,28 @@ enum XtWindow ((f)->output_data.x->widget) : \ FRAME_X_WINDOW (f)) #else +#ifdef USE_GTK +#define GTK_WIDGET_TO_X_WIN(w) \ + ((w) && (w)->window ? GDK_WINDOW_XWINDOW ((w)->window) : 0) + +#define FRAME_GTK_OUTER_WIDGET(f) ((f)->output_data.x->widget) +#define FRAME_GTK_WIDGET(f) ((f)->output_data.x->edit_widget) +#define FRAME_OUTER_WINDOW(f) \ + (FRAME_GTK_OUTER_WIDGET (f) ? \ + GTK_WIDGET_TO_X_WIN (FRAME_GTK_OUTER_WIDGET (f)) : \ + FRAME_X_WINDOW (f)) + +#else /* !USE_GTK */ #define FRAME_OUTER_WINDOW(f) (FRAME_X_WINDOW (f)) +#endif /* !USE_GTK */ #endif + #define FRAME_FONT(f) ((f)->output_data.x->font) #define FRAME_FONTSET(f) ((f)->output_data.x->fontset) -#define FRAME_INTERNAL_BORDER_WIDTH(f) ((f)->output_data.x->internal_border_width) #define FRAME_MENUBAR_HEIGHT(f) ((f)->output_data.x->menubar_height) -#define FRAME_LINE_HEIGHT(f) ((f)->output_data.x->line_height) - -/* Width of the default font of frame F. Must be defined by each - terminal specific header. */ -#define FRAME_DEFAULT_FONT_WIDTH(F) FONT_WIDTH (FRAME_FONT (F)) +#define FRAME_TOOLBAR_HEIGHT(f) ((f)->output_data.x->toolbar_height) +#define FRAME_BASELINE_OFFSET(f) ((f)->output_data.x->baseline_offset) /* This gives the x_display_info structure for the display F is on. */ #define FRAME_X_DISPLAY_INFO(f) ((f)->output_data.x->display_info) @@ -670,10 +671,6 @@ enum /* This is the 'font_info *' which frame F has. */ #define FRAME_X_FONT_TABLE(f) (FRAME_X_DISPLAY_INFO (f)->font_table) -/* These two really ought to be called FRAME_PIXEL_{WIDTH,HEIGHT}. */ -#define PIXEL_WIDTH(f) ((f)->output_data.x->pixel_width) -#define PIXEL_HEIGHT(f) ((f)->output_data.x->pixel_height) - /* The difference in pixels between the top left corner of the Emacs window (including possible window manager decorations) and FRAME_X_WINDOW (f). */ @@ -681,7 +678,7 @@ enum ((f)->output_data.x->x_pixels_outer_diff) #define FRAME_OUTER_TO_INNER_DIFF_Y(f) \ ((f)->output_data.x->y_pixels_outer_diff \ - + (f)->output_data.x->menubar_height) + + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f)) #define FRAME_XIC(f) ((f)->output_data.x->xic) @@ -704,25 +701,6 @@ enum #define FRAME_X_IMAGE_CACHE(F) FRAME_X_DISPLAY_INFO ((F))->image_cache - -/* Total width of fringes reserved for drawing truncation bitmaps, - continuation bitmaps and alike. The width is in canonical char - units of the frame. This must currently be the case because window - sizes aren't pixel values. If it weren't the case, we wouldn't be - able to split windows horizontally nicely. */ - -#define FRAME_X_FRINGE_COLS(F) ((F)->output_data.x->fringe_cols) - -/* Total width of fringes in pixels. */ - -#define FRAME_X_FRINGE_WIDTH(F) ((F)->output_data.x->fringes_extra) - -/* Pixel-width of the left and right fringe. */ - -#define FRAME_X_LEFT_FRINGE_WIDTH(F) ((F)->output_data.x->left_fringe_width) -#define FRAME_X_RIGHT_FRINGE_WIDTH(F) ((F)->output_data.x->right_fringe_width) - - /* X-specific scroll bar stuff. */ @@ -827,7 +805,7 @@ struct scroll_bar /* Return the length of the rectangle within which the top of the handle must stay. This isn't equivalent to the inside height, - because the scroll bar handle has a minimum height. + because the scroll bar handle has a minimum height. This is the real range of motion for the scroll bar, so when we're scaling buffer positions to scroll bar positions, we use this, not @@ -864,52 +842,6 @@ struct scroll_bar text from glomming up against the scroll bar */ #define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0) - -/* Manipulating pixel sizes and character sizes. - Knowledge of which factors affect the overall size of the window should - be hidden in these macros, if that's possible. - - Return the upper/left pixel position of the character cell on frame F - at ROW/COL. */ -#define CHAR_TO_PIXEL_ROW(f, row) \ - ((f)->output_data.x->internal_border_width \ - + (row) * (f)->output_data.x->line_height) -#define CHAR_TO_PIXEL_COL(f, col) \ - ((f)->output_data.x->internal_border_width \ - + (col) * FONT_WIDTH ((f)->output_data.x->font)) - -/* Return the pixel width/height of frame F if it has - WIDTH columns/HEIGHT rows. */ -#define CHAR_TO_PIXEL_WIDTH(f, width) \ - (CHAR_TO_PIXEL_COL (f, width) \ - + (f)->output_data.x->vertical_scroll_bar_extra \ - + (f)->output_data.x->fringes_extra \ - + (f)->output_data.x->internal_border_width) -#define CHAR_TO_PIXEL_HEIGHT(f, height) \ - (CHAR_TO_PIXEL_ROW (f, height) \ - + (f)->output_data.x->internal_border_width) - - -/* Return the row/column (zero-based) of the character cell containing - the pixel on FRAME at ROW/COL. */ -#define PIXEL_TO_CHAR_ROW(f, row) \ - (((row) - (f)->output_data.x->internal_border_width) \ - / (f)->output_data.x->line_height) -#define PIXEL_TO_CHAR_COL(f, col) \ - (((col) - (f)->output_data.x->internal_border_width) \ - / FONT_WIDTH ((f)->output_data.x->font)) - -/* How many columns/rows of text can we fit in WIDTH/HEIGHT pixels on - frame F? */ -#define PIXEL_TO_CHAR_WIDTH(f, width) \ - (PIXEL_TO_CHAR_COL (f, ((width) \ - - (f)->output_data.x->internal_border_width \ - - (f)->output_data.x->fringes_extra \ - - (f)->output_data.x->vertical_scroll_bar_extra))) -#define PIXEL_TO_CHAR_HEIGHT(f, height) \ - (PIXEL_TO_CHAR_ROW (f, ((height) \ - - (f)->output_data.x->internal_border_width))) - /* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT or SELECTION_CLEAR_EVENT, then its contents are really described @@ -970,7 +902,6 @@ extern void x_free_gcs P_ ((struct frame *)); /* From xrdb.c. */ -char *x_get_string_resource P_ ((XrmDatabase, char *, char *)); char *x_get_customization_string P_ ((XrmDatabase, char *, char *)); XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *)); int x_get_resource P_ ((XrmDatabase, char *, char *, @@ -979,8 +910,6 @@ void x_delete_display P_ ((struct x_display_info *)); void x_make_frame_visible P_ ((struct frame *)); void x_iconify_frame P_ ((struct frame *)); void x_wm_set_size_hint P_ ((struct frame *, long, int)); -void x_set_offset P_ ((struct frame *, int, int, int)); -void x_wm_set_icon_position P_ ((struct frame *, int, int)); int x_catch_errors P_ ((Display *)); int x_had_errors_p P_ ((Display *)); void x_uncatch_errors P_ ((Display *, int)); @@ -991,26 +920,18 @@ void x_set_window_size P_ ((struct frame *, int, int, int)); void x_wm_set_window_state P_ ((struct frame *, int)); int x_alloc_nearest_color P_ ((struct frame *, Colormap, XColor *)); -extern void pixel_to_glyph_coords P_ ((struct frame *, int, int, - int *, int *, XRectangle *, int)); - /* Defined in xterm.c */ extern void cancel_mouse_face P_ ((struct frame *)); extern void x_scroll_bar_clear P_ ((struct frame *)); extern void x_start_queuing_selection_requests P_ ((Display *)); extern void x_stop_queuing_selection_requests P_ ((Display *)); -extern void x_update_cursor P_ ((struct frame *, int)); extern int x_text_icon P_ ((struct frame *, char *)); extern int x_bitmap_icon P_ ((struct frame *, Lisp_Object)); extern int x_catch_errors P_ ((Display *)); extern void x_check_errors P_ ((Display *, char *)); extern int x_had_errors_p P_ ((Display *)); extern void x_uncatch_errors P_ ((Display *, int)); -extern Lisp_Object x_new_font P_ ((struct frame *, char *)); -extern Lisp_Object x_new_fontset P_ ((struct frame *, char *)); -extern void x_compute_fringe_widths P_ ((struct frame *, int)); -extern void x_set_offset P_ ((struct frame *, int, int, int)); extern void x_set_window_size P_ ((struct frame *, int, int, int)); extern void x_set_mouse_position P_ ((struct frame *, int, int)); extern void x_set_mouse_pixel_position P_ ((struct frame *, int, int)); @@ -1024,10 +945,8 @@ extern void x_destroy_window P_ ((struct frame *)); extern void x_wm_set_size_hint P_ ((struct frame *, long, int)); extern void x_wm_set_window_state P_ ((struct frame *, int)); extern void x_wm_set_icon_pixmap P_ ((struct frame *, int)); -extern void x_wm_set_icon_position P_ ((struct frame *, int, int)); extern void x_delete_display P_ ((struct x_display_info *)); extern void x_initialize P_ ((void)); -extern void x_display_cursor P_ ((struct window *, int, int, int, int, int)); extern unsigned long x_copy_color P_ ((struct frame *, unsigned long)); #ifdef USE_X_TOOLKIT extern XtAppContext Xt_app_con; @@ -1036,10 +955,7 @@ extern void x_query_colors P_ ((struct frame *f, XColor *, int)); extern void x_query_color P_ ((struct frame *f, XColor *)); extern void x_clear_area P_ ((Display *, Window, int, int, int, int, int)); -extern void x_fullscreen_adjust P_ ((struct frame *f, int *, int *, - int *, int *)); - -extern void x_dispatch_event P_ ((XEvent *, Display *)); +extern int x_dispatch_event P_ ((XEvent *, Display *)); /* Defined in xselect.c */ @@ -1060,9 +976,7 @@ extern int x_create_bitmap_from_data P_ ((struct frame *, char *, unsigned int, unsigned int)); extern int x_create_bitmap_from_file P_ ((struct frame *, Lisp_Object)); extern void x_destroy_bitmap P_ ((struct frame *, int)); -extern void x_set_frame_parameters P_ ((struct frame *, Lisp_Object)); extern void x_real_positions P_ ((struct frame *, int *, int *)); -extern void x_report_frame_params P_ ((struct frame *, Lisp_Object *)); extern int defined_color P_ ((struct frame *, char *, XColor *, int)); extern void x_set_border_pixel P_ ((struct frame *, int)); extern void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)); @@ -1088,7 +1002,6 @@ extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object)) /* Defined in xfaces.c */ -extern int frame_update_line_height P_ ((struct frame *)); extern int compute_glyph_face P_ ((struct frame *, int, int)); extern int compute_glyph_face_1 P_ ((struct frame *, Lisp_Object, int)); extern void x_free_dpy_colors P_ ((Display *, Screen *, Colormap, @@ -1113,3 +1026,22 @@ extern int x_session_check_input P_ ((struct input_event *bufp, int *numchars)); extern int x_session_have_connection P_ ((void)); #endif + +#define FONT_TYPE_FOR_UNIBYTE(font, ch) 0 +#define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0 + +#define STORE_XCHAR2B(chp, b1, b2) \ + ((chp)->byte1 = (b1), (chp)->byte2 = (b2)) + +#define XCHAR2B_BYTE1(chp) \ + ((chp)->byte1) + +#define XCHAR2B_BYTE2(chp) \ + ((chp)->byte2) + + +#define STORE_NATIVE_RECT(nr,rx,ry,rwidth,rheight) \ + ((nr).x = (rx), \ + (nr).y = (ry), \ + (nr).width = (rwidth), \ + (nr).height = (rheight))