/[emacs]/emacs/src/xterm.h
ViewVC logotype

Diff of /emacs/src/xterm.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.150.2.4 by miles, Thu Oct 14 08:49:55 2004 UTC revision 1.150.2.5 by miles, Fri Oct 22 10:13:35 2004 UTC
# Line 21  Boston, MA 02111-1307, USA.  */ Line 21  Boston, MA 02111-1307, USA.  */
21    
22  #include <X11/Xlib.h>  #include <X11/Xlib.h>
23  #include <X11/cursorfont.h>  #include <X11/cursorfont.h>
24    
25    /* Include Xutil.h after keysym.h to work around a bug that prevents
26       correct recognition of AltGr key in some X versions.  */
27    
28  #include <X11/keysym.h>  #include <X11/keysym.h>
29  #include <X11/Xutil.h>  #include <X11/Xutil.h>
30    
31  #include <X11/Xatom.h>  #include <X11/Xatom.h>
32  #include <X11/Xresource.h>  #include <X11/Xresource.h>
33    
# Line 45  typedef Widget xt_or_gtk_widget; Line 50  typedef Widget xt_or_gtk_widget;
50  typedef GtkWidget *xt_or_gtk_widget;  typedef GtkWidget *xt_or_gtk_widget;
51  #define XtParent(x) (gtk_widget_get_parent (x))  #define XtParent(x) (gtk_widget_get_parent (x))
52  #undef XSync  #undef XSync
53  #define XSync(d, b) gdk_window_process_all_updates ()  #define XSync(d, b) do { gdk_window_process_all_updates (); \
54                             XSync (d, b);  } while (0)
55        
56    
57  #endif /* USE_GTK */  #endif /* USE_GTK */
58    
# Line 596  struct x_output Line 603  struct x_output
603    XIC xic;    XIC xic;
604    XIMStyle xic_style;    XIMStyle xic_style;
605    XFontSet xic_xfs;    XFontSet xic_xfs;
606      char *xic_base_fontname;
607  #endif  #endif
608    
609    /* Relief GCs, colors etc.  */    /* Relief GCs, colors etc.  */
# Line 730  enum Line 738  enum
738  #define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles)  #define FRAME_X_XIM_STYLES(f) (FRAME_X_DISPLAY_INFO (f)->xim_styles)
739  #define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style)  #define FRAME_XIC_STYLE(f) ((f)->output_data.x->xic_style)
740  #define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs)  #define FRAME_XIC_FONTSET(f) ((f)->output_data.x->xic_xfs)
741    #define FRAME_XIC_BASE_FONTNAME(f) ((f)->output_data.x->xic_base_fontname)
742    
743  /* Value is the smallest width of any character in any font on frame F.  */  /* Value is the smallest width of any character in any font on frame F.  */
744    
# Line 1039  extern void x_set_menu_bar_lines P_ ((st Line 1048  extern void x_set_menu_bar_lines P_ ((st
1048  extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object, int,  extern unsigned char * x_encode_text P_ ((Lisp_Object, Lisp_Object, int,
1049                                            int *, int *));                                            int *, int *));
1050  extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));  extern void x_implicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
1051    extern void xic_free_xfontset P_ ((struct frame *));
1052  extern void create_frame_xic P_ ((struct frame *));  extern void create_frame_xic P_ ((struct frame *));
1053  extern void destroy_frame_xic P_ ((struct frame *));  extern void destroy_frame_xic P_ ((struct frame *));
1054  extern void xic_set_preeditarea P_ ((struct window *, int, int));  extern void xic_set_preeditarea P_ ((struct window *, int, int));

Legend:
Removed from v.1.150.2.4  
changed lines
  Added in v.1.150.2.5

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26