src/video/x11/SDL_x11video.h
changeset 1178 9867f3d86e44
parent 1168 045f186426e1
child 1242 caf0328c8058
equal deleted inserted replaced
1177:e967ab22e6fd 1178:9867f3d86e44
    60     Window WMwindow;		/* Input window, managed by window manager */
    60     Window WMwindow;		/* Input window, managed by window manager */
    61     Window FSwindow;		/* Fullscreen window, completely unmanaged */
    61     Window FSwindow;		/* Fullscreen window, completely unmanaged */
    62     Window SDL_Window;		/* Shared by both displays (no X security?) */
    62     Window SDL_Window;		/* Shared by both displays (no X security?) */
    63     Atom WM_DELETE_WINDOW;	/* "close-window" protocol atom */
    63     Atom WM_DELETE_WINDOW;	/* "close-window" protocol atom */
    64     WMcursor *BlankCursor;	/* The invisible cursor */
    64     WMcursor *BlankCursor;	/* The invisible cursor */
       
    65     XIM X11_IM;		/* Used to communicate with the input method (IM) server */
       
    66     XIC X11_IC;		/* Used for retaining the state, properties, and semantics of communication with                                                  the input method (IM) server */
    65 
    67 
    66     char *SDL_windowid;		/* Flag: true if we have been passed a window */
    68     char *SDL_windowid;		/* Flag: true if we have been passed a window */
    67 
    69 
    68     /* Direct Graphics Access extension information */
    70     /* Direct Graphics Access extension information */
    69     int using_dga;
    71     int using_dga;
   145 /* Old variable names */
   147 /* Old variable names */
   146 #define local_X11		(this->hidden->local_X11)
   148 #define local_X11		(this->hidden->local_X11)
   147 #define SDL_Display		(this->hidden->X11_Display)
   149 #define SDL_Display		(this->hidden->X11_Display)
   148 #define GFX_Display		(this->hidden->GFX_Display)
   150 #define GFX_Display		(this->hidden->GFX_Display)
   149 #define SDL_Screen		DefaultScreen(this->hidden->X11_Display)
   151 #define SDL_Screen		DefaultScreen(this->hidden->X11_Display)
   150 
       
   151 #define SDL_Visual		(this->hidden->vis)
   152 #define SDL_Visual		(this->hidden->vis)
   152 
       
   153 #define SDL_Root		RootWindow(SDL_Display, SDL_Screen)
   153 #define SDL_Root		RootWindow(SDL_Display, SDL_Screen)
   154 #define WMwindow		(this->hidden->WMwindow)
   154 #define WMwindow		(this->hidden->WMwindow)
   155 #define FSwindow		(this->hidden->FSwindow)
   155 #define FSwindow		(this->hidden->FSwindow)
   156 #define SDL_Window		(this->hidden->SDL_Window)
   156 #define SDL_Window		(this->hidden->SDL_Window)
   157 #define WM_DELETE_WINDOW	(this->hidden->WM_DELETE_WINDOW)
   157 #define WM_DELETE_WINDOW	(this->hidden->WM_DELETE_WINDOW)
   158 #define SDL_BlankCursor		(this->hidden->BlankCursor)
   158 #define SDL_BlankCursor		(this->hidden->BlankCursor)
       
   159 #define SDL_IM		(this->hidden->X11_IM)
       
   160 #define SDL_IC		(this->hidden->X11_IC)
   159 #define SDL_windowid		(this->hidden->SDL_windowid)
   161 #define SDL_windowid		(this->hidden->SDL_windowid)
   160 #define using_dga		(this->hidden->using_dga)
   162 #define using_dga		(this->hidden->using_dga)
   161 #define use_mitshm		(this->hidden->use_mitshm)
   163 #define use_mitshm		(this->hidden->use_mitshm)
   162 #define shminfo			(this->hidden->shminfo)
   164 #define shminfo			(this->hidden->shminfo)
   163 #define SDL_Ximage		(this->hidden->Ximage)
   165 #define SDL_Ximage		(this->hidden->Ximage)
   184 #define SDL_XColorMap		(this->hidden->XColorMap)
   186 #define SDL_XColorMap		(this->hidden->XColorMap)
   185 #define SDL_XPixels		(this->hidden->XPixels)
   187 #define SDL_XPixels		(this->hidden->XPixels)
   186 #define gamma_saved		(this->hidden->gamma_saved)
   188 #define gamma_saved		(this->hidden->gamma_saved)
   187 #define gamma_changed		(this->hidden->gamma_changed)
   189 #define gamma_changed		(this->hidden->gamma_changed)
   188 #define SDL_iconcolors		(this->hidden->iconcolors)
   190 #define SDL_iconcolors		(this->hidden->iconcolors)
   189 
       
   190 /* Some versions of XFree86 have bugs - detect if this is one of them */
   191 /* Some versions of XFree86 have bugs - detect if this is one of them */
   191 #define BUGGY_XFREE86(condition, buggy_version) \
   192 #define BUGGY_XFREE86(condition, buggy_version) \
   192 ((strcmp(ServerVendor(SDL_Display), "The XFree86 Project, Inc") == 0) && \
   193 ((strcmp(ServerVendor(SDL_Display), "The XFree86 Project, Inc") == 0) && \
   193  (VendorRelease(SDL_Display) condition buggy_version))
   194  (VendorRelease(SDL_Display) condition buggy_version))
   194 
   195