parent
42ad2b8836
commit
b04daa8b86
57
src/x.c
57
src/x.c
|
@ -21,7 +21,6 @@
|
|||
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#define DECLARE_WIN 1
|
||||
#include "E.h"
|
||||
#include "edebug.h"
|
||||
#include "util.h"
|
||||
|
@ -59,62 +58,6 @@ static Win win_last = NULL;
|
|||
|
||||
#define WinBgInvalidate(win) if (win->bg_owned > 0) win->bg_owned = -1
|
||||
|
||||
#if !EXPOSE_WIN
|
||||
Window
|
||||
WinGetXwin(const Win win)
|
||||
{
|
||||
return win->xwin;
|
||||
}
|
||||
|
||||
int
|
||||
WinGetX(const Win win)
|
||||
{
|
||||
return win->x;
|
||||
}
|
||||
|
||||
int
|
||||
WinGetY(const Win win)
|
||||
{
|
||||
return win->y;
|
||||
}
|
||||
|
||||
int
|
||||
WinGetW(const Win win)
|
||||
{
|
||||
return win->w;
|
||||
}
|
||||
|
||||
int
|
||||
WinGetH(const Win win)
|
||||
{
|
||||
return win->h;
|
||||
}
|
||||
|
||||
int
|
||||
WinGetBorderWidth(const Win win)
|
||||
{
|
||||
return win->bw;
|
||||
}
|
||||
|
||||
int
|
||||
WinGetDepth(const Win win)
|
||||
{
|
||||
return win->depth;
|
||||
}
|
||||
|
||||
Visual *
|
||||
WinGetVisual(const Win win)
|
||||
{
|
||||
return win->visual;
|
||||
}
|
||||
|
||||
Colormap
|
||||
WinGetCmap(const Win win)
|
||||
{
|
||||
return win->cmap;
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
EXInit(void)
|
||||
{
|
||||
|
|
15
src/xwin.h
15
src/xwin.h
|
@ -79,8 +79,6 @@ Time EGetTimestamp(void);
|
|||
|
||||
typedef void (EventCallbackFunc) (Win win, XEvent * ev, void *prm);
|
||||
|
||||
#define EXPOSE_WIN 1
|
||||
#if EXPOSE_WIN || DECLARE_WIN
|
||||
typedef struct {
|
||||
EventCallbackFunc *func;
|
||||
void *prm;
|
||||
|
@ -114,11 +112,9 @@ struct _xwin {
|
|||
Pixmap bgpmap;
|
||||
unsigned int bgcol;
|
||||
};
|
||||
#endif
|
||||
|
||||
Win ELookupXwin(Window xwin);
|
||||
|
||||
#if EXPOSE_WIN
|
||||
#define WinGetXwin(win) ((win)->xwin)
|
||||
#define WinGetPmap(win) ((win)->bgpmap)
|
||||
#define WinGetX(win) ((win)->x)
|
||||
|
@ -130,17 +126,6 @@ Win ELookupXwin(Window xwin);
|
|||
#define WinGetVisual(win) ((win)->visual)
|
||||
#define WinGetCmap(win) ((win)->cmap)
|
||||
#define WinIsShaped(win) ((win)->num_rect != 0)
|
||||
#else
|
||||
Window WinGetXwin(const Win win);
|
||||
int WinGetX(const Win win);
|
||||
int WinGetY(const Win win);
|
||||
int WinGetW(const Win win);
|
||||
int WinGetH(const Win win);
|
||||
int WinGetBorderWidth(const Win win);
|
||||
int WinGetDepth(const Win win);
|
||||
Visual *WinGetVisual(const Win win);
|
||||
Colormap WinGetCmap(const Win win);
|
||||
#endif
|
||||
|
||||
Win ECreateWinFromXwin(Window xwin);
|
||||
void EDestroyWin(Win win);
|
||||
|
|
Loading…
Reference in New Issue