parent
23a891cbf8
commit
307afc96bd
|
@ -75,8 +75,6 @@ ecore_x_icccm_state_set_withdrawn(Ecore_X_Window win)
|
||||||
|
|
||||||
#else /* USE_ECORE_X */
|
#else /* USE_ECORE_X */
|
||||||
|
|
||||||
extern Display *disp;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* General stuff
|
* General stuff
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -259,6 +259,9 @@ EImageTile(EImage * im, EImage * tile, int blend, int tw, int th,
|
||||||
int x, y, tx, ty, ww, hh;
|
int x, y, tx, ty, ww, hh;
|
||||||
int sw, sh;
|
int sw, sh;
|
||||||
|
|
||||||
|
if (tw <= 0 || th <= 0)
|
||||||
|
return;
|
||||||
|
|
||||||
imlib_context_set_image(tile);
|
imlib_context_set_image(tile);
|
||||||
sw = imlib_image_get_width();
|
sw = imlib_image_get_width();
|
||||||
sh = imlib_image_get_height();
|
sh = imlib_image_get_height();
|
||||||
|
|
|
@ -105,7 +105,6 @@ void EHintsSetInfoOnAll(void);
|
||||||
void ICCCM_Init(void);
|
void ICCCM_Init(void);
|
||||||
void ICCCM_ProcessClientMessage(XClientMessageEvent * event);
|
void ICCCM_ProcessClientMessage(XClientMessageEvent * event);
|
||||||
void ICCCM_GetTitle(EWin * ewin, Atom atom_change);
|
void ICCCM_GetTitle(EWin * ewin, Atom atom_change);
|
||||||
void ICCCM_GetColormap(EWin * ewin);
|
|
||||||
void ICCCM_Delete(const EWin * ewin);
|
void ICCCM_Delete(const EWin * ewin);
|
||||||
void ICCCM_Save(const EWin * ewin);
|
void ICCCM_Save(const EWin * ewin);
|
||||||
void ICCCM_Iconify(const EWin * ewin);
|
void ICCCM_Iconify(const EWin * ewin);
|
||||||
|
|
|
@ -92,7 +92,7 @@ ICCCM_GetTitle(EWin * ewin, Atom atom_change)
|
||||||
EwinChange(ewin, EWIN_CHANGE_NAME);
|
EwinChange(ewin, EWIN_CHANGE_NAME);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
static void
|
||||||
ICCCM_GetColormap(EWin * ewin)
|
ICCCM_GetColormap(EWin * ewin)
|
||||||
{
|
{
|
||||||
XWindowAttributes xwa;
|
XWindowAttributes xwa;
|
||||||
|
|
|
@ -65,7 +65,7 @@ static struct
|
||||||
|
|
||||||
static int sound_fd = -1;
|
static int sound_fd = -1;
|
||||||
|
|
||||||
Ecore_List *sound_list = NULL;
|
static Ecore_List *sound_list = NULL;
|
||||||
|
|
||||||
#ifdef HAVE_LIBESD
|
#ifdef HAVE_LIBESD
|
||||||
static Sample *
|
static Sample *
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include "E.h"
|
#include "E.h"
|
||||||
#include "eimage.h"
|
#include "eimage.h"
|
||||||
#include "tclass.h"
|
#include "tclass.h"
|
||||||
#include "xwin.h"
|
|
||||||
#include <Imlib2.h>
|
#include <Imlib2.h>
|
||||||
|
|
||||||
struct _efont
|
struct _efont
|
||||||
|
|
6
src/x.c
6
src/x.c
|
@ -64,7 +64,7 @@ struct _xwin
|
||||||
int depth;
|
int depth;
|
||||||
Colormap cmap;
|
Colormap cmap;
|
||||||
Pixmap bgpmap;
|
Pixmap bgpmap;
|
||||||
int bgcol;
|
unsigned int bgcol;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct _xwin EXID; /* FIXME - Remove */
|
typedef struct _xwin EXID; /* FIXME - Remove */
|
||||||
|
@ -110,7 +110,7 @@ EXidCreate(void)
|
||||||
EXID *xid;
|
EXID *xid;
|
||||||
|
|
||||||
xid = Ecalloc(1, sizeof(EXID));
|
xid = Ecalloc(1, sizeof(EXID));
|
||||||
xid->bgcol = -1;
|
xid->bgcol = 0xffffffff;
|
||||||
|
|
||||||
return xid;
|
return xid;
|
||||||
}
|
}
|
||||||
|
@ -905,7 +905,7 @@ ESetWindowBackgroundPixmap(Win win, Pixmap pmap)
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ESetWindowBackground(Win win, int col)
|
ESetWindowBackground(Win win, unsigned int col)
|
||||||
{
|
{
|
||||||
EXID *xid = win;
|
EXID *xid = win;
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ void EGetWindowAttributes(Win win, XWindowAttributes * pxwa);
|
||||||
void EConfigureWindow(Win win, unsigned int mask,
|
void EConfigureWindow(Win win, unsigned int mask,
|
||||||
XWindowChanges * wc);
|
XWindowChanges * wc);
|
||||||
void ESetWindowBackgroundPixmap(Win win, Pixmap pmap);
|
void ESetWindowBackgroundPixmap(Win win, Pixmap pmap);
|
||||||
void ESetWindowBackground(Win win, int col);
|
void ESetWindowBackground(Win win, unsigned int col);
|
||||||
int ETranslateCoordinates(Win src_w, Win dst_w,
|
int ETranslateCoordinates(Win src_w, Win dst_w,
|
||||||
int src_x, int src_y,
|
int src_x, int src_y,
|
||||||
int *dest_x_return,
|
int *dest_x_return,
|
||||||
|
|
Loading…
Reference in New Issue