e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Assorted cleanups. 

SVN revision: 8807
This commit is contained in:
Kim Woelders 2004-02-04 20:17:31 +00:00
parent 1d7e5087de
commit 8c9f368234
3 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eesh/E.h
View File

@ -48,10 +48,6 @@
#include <sys/ipc.h>
#include <sys/shm.h>
#ifndef ENLIGHTENMENT_ROOT
#define ENLIGHTENMENT_ROOT "/usr/local/enlightenment"
#endif
#define LIST_FINDBY_NAME 0
#define LIST_FINDBY_ID 1
#define LIST_FINDBY_BOTH 2

43
src/E.h
View File

@ -200,12 +200,6 @@ if (__xim) XDestroyImage(__xim);}
/* long's on 64bit machines... thus well the CARD32's Im unsing shoudl be.. */
#define CARD32 long
#if (WITH_TARTY_WARP == 1)
#define WITH_TARTY_WARP 1
#else
#undef WITH_TARTY_WARP
#endif /* !WITH_TARTY_WARP */
#define RESET_ALERT \
AssignTitleText(_("Enlightenment Message Dialog")); \
AssignIgnoreText(_("Ignore this")); \
@ -249,11 +243,6 @@ if (__xim) XDestroyImage(__xim);}
#endif
#endif
/* shut warnings up
* pid_t wait3(int *status, int options, struct rusage *rusage);
* int setenv(const char *name, const char *value, int overwrite);
*/
#define FILEPATH_LEN_MAX 4096
/* This turns on E's internal stack tracking system for coarse debugging */
/* and being able to trace E for profiling/optimisation purposes (which */
@ -364,16 +353,6 @@ int Esnprintf(va_alist);
#define SPANS_COMMON(x1, w1, x2, w2) \
(!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
#define EERR_NONE 0
#define EERR_OUT_OF_MEMORY 1
#define EERR_FILE_NOT_EXIST 2
#define EERR_PERMISSION_DENIED 3
#define EERR_FILING_SYSTEM_FULL 4
#ifndef ENLIGHTENMENT_ROOT
#define ENLIGHTENMENT_ROOT "/usr/local/enlightenment"
#endif
#define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32
/* the cast is so -1 will == UINT_MAX */
#define DESKTOPS_WRAP_NUM(x) \
@ -1549,28 +1528,6 @@ struct _iconbox
};
#endif /* DECLARE_STRUCT_ICONBOX */
#ifdef DECLARE_STRUCT_PAGER
struct _pager
{
char *name;
Window win;
Pixmap pmap;
Pixmap bgpmap;
int desktop;
int w, h;
int dw, dh;
char visible;
int update_phase;
EWin *ewin;
char *border_name;
Window sel_win;
char hi_visible;
Window hi_win;
EWin *hi_ewin;
int hi_win_w, hi_win_h;
};
#endif /* DECLARE_STRUCT_PAGER */
typedef struct _drawqueue
{
Window win;

25
src/pager.c
View File

@ -20,12 +20,31 @@
* 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_STRUCT_PAGER
#include "E.h"
struct _pager
{
char *name;
Window win;
Pixmap pmap;
Pixmap bgpmap;
int desktop;
int w, h;
int dw, dh;
char visible;
int update_phase;
EWin *ewin;
char *border_name;
Window sel_win;
char hi_visible;
Window hi_win;
EWin *hi_ewin;
int hi_win_w, hi_win_h;
};
#define PAGER_EVENT_MOUSE_OUT -1
#define PAGER_EVENT_MOTION 0
#define PAGER_EVENT_MOUSE_IN 1
#define PAGER_EVENT_MOTION 0
#define PAGER_EVENT_MOUSE_IN 1
static void PagerUpdateTimeout(int val, void *data);
static void PagerEwinUpdateMini(Pager * p, EWin * ewin);