Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h areas.c coords.c draw.c ecompmgr.c events.c ewin-ops.c
ipc.c main.c mod-misc.c moveresize.c settings.c startup.c
theme.c tooltips.c x.c
Log Message:
Cleanups, stuff, debug.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.74
retrieving revision 1.314.2.75
diff -u -3 -r1.314.2.74 -r1.314.2.75
--- E.h 18 Dec 2004 00:00:54 -0000 1.314.2.74
+++ E.h 22 Dec 2004 23:39:06 -0000 1.314.2.75
@@ -918,6 +918,13 @@
} menus;
struct
{
+ int mode_move;
+ int mode_resize;
+ int mode_info;
+ int opacity;
+ } movres;
+ struct
+ {
char enable;
char zoom;
char title;
@@ -944,6 +951,7 @@
struct
{
char *name;
+ char use_startup_background;
} theme;
#ifdef ENABLE_THEME_TRANSPARENCY
struct
@@ -972,9 +980,6 @@
char warp_on_select;
} warplist;
int deskmode;
- int movemode;
- int resizemode;
- int geominfomode;
int slidemode;
char cleanupslide;
char mapslide;
@@ -1697,6 +1702,7 @@
void MoveEwinToDesktop(EWin * ewin, int num);
void MoveEwinToDesktopAt(EWin * ewin, int num, int x, int y);
+unsigned int OpacityExt(int op);
void EwinOpClose(EWin * ewin);
void EwinOpKill(EWin * ewin);
void EwinOpRaise(EWin * ewin);
@@ -2321,6 +2327,7 @@
Window WindowAtXY_0(Window base, int bx, int by, int x, int y);
Window WindowAtXY(int x, int y);
void PointerAt(int *x, int *y);
+void EDrawableDumpImage(Drawable draw, const char *txt);
/* zoom.c */
EWin *GetZoomEWin(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/areas.c,v
retrieving revision 1.71.2.11
retrieving revision 1.71.2.12
diff -u -3 -r1.71.2.11 -r1.71.2.12
--- areas.c 20 Oct 2004 21:04:04 -0000 1.71.2.11
+++ areas.c 22 Dec 2004 23:39:07 -0000 1.71.2.12
@@ -267,7 +267,7 @@
if (EoGetDesk(ewin) != DesksGetCurrent() && !EoIsFloating(ewin))
continue;
- if (!(EoIsFloating(ewin) && Conf.movemode == 0))
+ if (!(EoIsFloating(ewin) && Conf.movres.mode_move == 0))
{
wnum++;
wl = Erealloc(wl, sizeof(Window) * wnum);
@@ -294,7 +294,7 @@
if (EoGetDesk(ewin) != DesksGetCurrent() && !EoIsFloating(ewin))
continue;
- if (!(EoIsFloating(ewin) && Conf.movemode == 0))
+ if (!(EoIsFloating(ewin) && Conf.movres.mode_move == 0))
MoveEwin(ewin, EoGetX(ewin) - dx, EoGetY(ewin) - dy);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/coords.c,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -3 -r1.21.2.3 -r1.21.2.4
--- coords.c 20 Oct 2004 21:04:05 -0000 1.21.2.3
+++ coords.c 22 Dec 2004 23:39:07 -0000 1.21.2.4
@@ -35,7 +35,7 @@
int md;
int x, y, w, h;
- if (!Conf.geominfomode)
+ if (!Conf.movres.mode_info)
return;
if (ewin == NULL)
return;
@@ -60,13 +60,13 @@
if (ewin)
{
if (Mode.mode == MODE_MOVE)
- md = Conf.movemode;
+ md = Conf.movres.mode_move;
else
- md = Conf.resizemode;
+ md = Conf.movres.mode_resize;
if ((md == 0) || ((cw < ewin->client.w) && (ch < ewin->client.h)))
{
- if (Conf.geominfomode == 1)
+ if (Conf.movres.mode_info == 1)
{
switch (md)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.51.2.8
retrieving revision 1.51.2.9
diff -u -3 -r1.51.2.8 -r1.51.2.9
--- draw.c 17 Oct 2004 08:47:25 -0000 1.51.2.8
+++ draw.c 22 Dec 2004 23:39:07 -0000 1.51.2.9
@@ -39,13 +39,13 @@
{
case MODE_MOVE_PENDING:
case MODE_MOVE:
- if (Conf.movemode > 0)
+ if (Conf.movres.mode_move > 0)
EDBUG_RETURN_;
break;
case MODE_RESIZE:
case MODE_RESIZE_H:
case MODE_RESIZE_V:
- if (Conf.resizemode > 0)
+ if (Conf.movres.mode_resize > 0)
EDBUG_RETURN_;
break;
}
@@ -1609,9 +1609,9 @@
ECreatePixImg(VRoot.win, EoGetW(ewin), EoGetH(ewin));
if ((!root_pi) || (!ewin_pi) || (!draw_pi))
{
- Conf.movemode = 0;
+ Conf.movres.mode_move = 0;
ecore_x_ungrab();
- DrawEwinShape(ewin, Conf.movemode, x, y, w, h,
+ DrawEwinShape(ewin, Conf.movres.mode_move, x, y, w, h,
firstlast);
goto done;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ecompmgr.c,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -3 -r1.1.2.11 -r1.1.2.12
--- ecompmgr.c 22 Dec 2004 19:52:02 -0000 1.1.2.11
+++ ecompmgr.c 22 Dec 2004 23:39:08 -0000 1.1.2.12
@@ -1476,21 +1476,6 @@
w->damaged = 1;
}
-#if 0 /* FIXME - Remove */
-static void
-ECompMgrWinProperty(EObj * eo, XEvent * ev)
-{
- /* check if Trans property was changed */
- if (ev->xproperty.atom == _NET_WM_WINDOW_OPACITY)
- {
- /* reset mode and redraw window */
- D1printf("ECompMgrWinProperty %#lx\n", eo->win);
-
- ECompMgrWinChangeOpacity(eo, get_opacity_prop(eo, OPAQUE));
- }
-}
-#endif
-
/* Ensure that the blend mask is up to date */
static void
ECompMgrCheckAlphaMask(ECmWinInfo * w)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.69.2.22
retrieving revision 1.69.2.23
diff -u -3 -r1.69.2.22 -r1.69.2.23
--- events.c 30 Nov 2004 23:19:01 -0000 1.69.2.22
+++ events.c 22 Dec 2004 23:39:08 -0000 1.69.2.23
@@ -23,10 +23,10 @@
#include "E.h"
#include <errno.h>
#include <sys/time.h>
-#ifdef USE_XRANDR
+#if USE_XRANDR
#include <X11/extensions/Xrandr.h>
#endif
-#ifdef USE_COMPOSITE
+#if USE_COMPOSITE
#include <X11/extensions/Xcomposite.h>
#include <X11/extensions/Xdamage.h>
#include <X11/extensions/Xfixes.h>
@@ -40,12 +40,12 @@
static int event_base_shape = 0;
static int error_base_shape = 0;
-#ifdef USE_XRANDR
+#if USE_XRANDR
static int event_base_randr = 0;
static int error_base_randr = 0;
#endif
-#ifdef USE_COMPOSITE
+#if USE_COMPOSITE
static int event_base_comp = 0;
static int error_base_comp = 0;
static int event_base_damage = 0;
@@ -101,7 +101,7 @@
EExit(1);
}
-#ifdef USE_XRANDR
+#if USE_XRANDR
if (XRRQueryExtension(disp, &event_base_randr, &error_base_randr))
{
XRRQueryVersion(disp, &major, &minor);
@@ -113,7 +113,7 @@
}
#endif
-#ifdef USE_COMPOSITE
+#if USE_COMPOSITE
if (XCompositeQueryExtension(disp, &event_base_comp, &error_base_comp))
{
XCompositeQueryVersion(disp, &major, &minor);
@@ -318,7 +318,7 @@
case ClientMessage: /* 33 */
HintsProcessClientMessage(&(ev->xclient));
break;
-#ifdef USE_XRANDR
+#if USE_XRANDR
case EX_EVENT_SCREEN_CHANGE_NOTIFY:
{
XRRScreenChangeNotifyEvent *rrev = (XRRScreenChangeNotifyEvent *) ev;
@@ -502,11 +502,11 @@
/* Map some event types to E internals */
if (ev->type == event_base_shape + ShapeNotify)
ev->type = EX_EVENT_SHAPE_NOTIFY;
-#ifdef USE_XRANDR
+#if USE_XRANDR
else if (ev->type == event_base_randr + RRScreenChangeNotify)
ev->type = EX_EVENT_SCREEN_CHANGE_NOTIFY;
#endif
-#ifdef USE_COMPOSITE
+#if USE_COMPOSITE
else if (ev->type == event_base_damage + XDamageNotify)
ev->type = EX_EVENT_DAMAGE_NOTIFY;
#endif
@@ -961,12 +961,12 @@
case EX_EVENT_SHAPE_NOTIFY:
Eprintf("%#08lx EV-%s win=%#lx\n", ser, name, win);
break;
-#ifdef USE_XRANDR
+#if USE_XRANDR
case EX_EVENT_SCREEN_CHANGE_NOTIFY:
Eprintf("%#08lx EV-%s win=%#lx\n", ser, name, win);
break;
#endif
-#ifdef USE_COMPOSITE
+#if USE_COMPOSITE
#define de ((XDamageNotifyEvent *)ev)
case EX_EVENT_DAMAGE_NOTIFY:
Eprintf("%#08lx EV-%s win=%#lx %d+%d %dx%d\n", ser, name, win,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ewin-ops.c,v
retrieving revision 1.1.2.23
retrieving revision 1.1.2.24
diff -u -3 -r1.1.2.23 -r1.1.2.24
--- ewin-ops.c 15 Dec 2004 22:17:09 -0000 1.1.2.23
+++ ewin-ops.c 22 Dec 2004 23:39:08 -0000 1.1.2.24
@@ -251,8 +251,12 @@
}
}
+ if (EventDebug(250))
+ EDrawableDumpImage(ewin->o.win, "Win1");
EMoveResizeWindow(disp, EoGetWin(ewin), EoGetX(ewin), EoGetY(ewin),
EoGetW(ewin), EoGetH(ewin));
+ if (EventDebug(250))
+ EDrawableDumpImage(ewin->o.win, "Win2");
if (ewin->shaded == 0)
{
@@ -1623,11 +1627,24 @@
Efree(gwins);
}
+unsigned int
+OpacityExt(int op)
+{
+ /* op is 0-255, extend to 32 bit */
+ /* op = 0 is mapped to 255 (opaque) */
+ if (op <= 0 || op > 255)
+ op = 255;
+ return (op << 24) | (op << 16) | (op << 8) | op;
+}
+
void
EwinOpSetOpacity(EWin * ewin, int opacity)
{
- HintsSetWindowOpacity(ewin, opacity);
- EoChangeOpacity(ewin, opacity);
+ unsigned int op;
+
+ op = OpacityExt(opacity);
+ HintsSetWindowOpacity(ewin, op);
+ EoChangeOpacity(ewin, op);
RememberImportantInfoForEwin(ewin);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174.2.39
retrieving revision 1.174.2.40
diff -u -3 -r1.174.2.39 -r1.174.2.40
--- ipc.c 14 Dec 2004 22:20:39 -0000 1.174.2.39
+++ ipc.c 22 Dec 2004 23:39:08 -0000 1.174.2.40
@@ -360,41 +360,41 @@
{
if (!strcmp(params, "opaque"))
{
- Conf.movemode = 0;
+ Conf.movres.mode_move = 0;
}
else if (!strcmp(params, "lined"))
{
- Conf.movemode = 1;
+ Conf.movres.mode_move = 1;
}
else if (!strcmp(params, "box"))
{
- Conf.movemode = 2;
+ Conf.movres.mode_move = 2;
}
else if (!strcmp(params, "shaded"))
{
- Conf.movemode = 3;
+ Conf.movres.mode_move = 3;
}
else if (!strcmp(params, "semi-solid"))
{
- Conf.movemode = 4;
+ Conf.movres.mode_move = 4;
}
else if (!strcmp(params, "translucent"))
{
- Conf.movemode = 5;
+ Conf.movres.mode_move = 5;
}
else if (!strcmp(params, "?"))
{
- if (Conf.movemode)
+ if (Conf.movres.mode_move)
{
- if (Conf.movemode == 1)
+ if (Conf.movres.mode_move == 1)
Esnprintf(buf, sizeof(buf), "movemode: lined");
- else if (Conf.movemode == 2)
+ else if (Conf.movres.mode_move == 2)
Esnprintf(buf, sizeof(buf), "movemode: box");
- else if (Conf.movemode == 3)
+ else if (Conf.movres.mode_move == 3)
Esnprintf(buf, sizeof(buf), "movemode: shaded");
- else if (Conf.movemode == 4)
+ else if (Conf.movres.mode_move == 4)
Esnprintf(buf, sizeof(buf), "movemode: semi-solid");
- else if (Conf.movemode == 5)
+ else if (Conf.movres.mode_move == 5)
Esnprintf(buf, sizeof(buf), "movemode: translucent");
}
else
@@ -427,35 +427,35 @@
{
if (!strcmp(params, "opaque"))
{
- Conf.resizemode = 0;
+ Conf.movres.mode_resize = 0;
}
else if (!strcmp(params, "lined"))
{
- Conf.resizemode = 1;
+ Conf.movres.mode_resize = 1;
}
else if (!strcmp(params, "box"))
{
- Conf.resizemode = 2;
+ Conf.movres.mode_resize = 2;
}
else if (!strcmp(params, "shaded"))
{
- Conf.resizemode = 3;
+ Conf.movres.mode_resize = 3;
}
else if (!strcmp(params, "semi-solid"))
{
- Conf.resizemode = 4;
+ Conf.movres.mode_resize = 4;
}
else if (!strcmp(params, "?"))
{
- if (Conf.resizemode)
+ if (Conf.movres.mode_resize)
{
- if (Conf.resizemode == 1)
+ if (Conf.movres.mode_resize == 1)
Esnprintf(buf, sizeof(buf), "resizemode: lined");
- else if (Conf.resizemode == 2)
+ else if (Conf.movres.mode_resize == 2)
Esnprintf(buf, sizeof(buf), "resizemode: box");
- else if (Conf.resizemode == 3)
+ else if (Conf.movres.mode_resize == 3)
Esnprintf(buf, sizeof(buf), "resizemode: shaded");
- else if (Conf.resizemode == 4)
+ else if (Conf.movres.mode_resize == 4)
Esnprintf(buf, sizeof(buf), "resizemode: semi-solid");
}
else
@@ -488,23 +488,23 @@
{
if (!strcmp(params, "never"))
{
- Conf.geominfomode = 0;
+ Conf.movres.mode_info = 0;
}
else if (!strcmp(params, "center"))
{
- Conf.geominfomode = 1;
+ Conf.movres.mode_info = 1;
}
else if (!strcmp(params, "corner"))
{
- Conf.geominfomode = 2;
+ Conf.movres.mode_info = 2;
}
else if (!strcmp(params, "?"))
{
- if (Conf.geominfomode)
+ if (Conf.movres.mode_info)
{
- if (Conf.geominfomode == 1)
+ if (Conf.movres.mode_info == 1)
Esnprintf(buf, sizeof(buf), "geominfomode: center");
- else if (Conf.geominfomode == 2)
+ else if (Conf.movres.mode_info == 2)
Esnprintf(buf, sizeof(buf), "geominfomode: corner");
}
else
@@ -745,7 +745,6 @@
{
val = 0xff;
sscanf(param1, "%i", &val);
- val = (val << 24) | (val << 16) | (val << 8) | val;
EwinOpSetOpacity(ewin, val);
}
}
@@ -1236,6 +1235,22 @@
IpcPrintf("Grab %#lx\n", win);
}
}
+ else if (!strncmp(param, "sync", 2))
+ {
+ l = 0;
+ sscanf(p, "%1000s %n", param, &l);
+ p += l;
+ if (!strncmp(param, "on", 2))
+ {
+ XSynchronize(disp, True);
+ IpcPrintf("Sync on\n");
+ }
+ else if (!strncmp(param, "off", 2))
+ {
+ XSynchronize(disp, False);
+ IpcPrintf("Sync off\n");
+ }
+ }
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.99.2.31
retrieving revision 1.99.2.32
diff -u -3 -r1.99.2.31 -r1.99.2.32
--- main.c 13 Dec 2004 21:29:10 -0000 1.99.2.31
+++ main.c 22 Dec 2004 23:39:10 -0000 1.99.2.32
@@ -25,7 +25,7 @@
#include <sys/utsname.h>
#include <signal.h>
#include <time.h>
-#ifdef USE_COMPOSITE
+#if USE_COMPOSITE
#include "ecompmgr.h"
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-misc.c,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -3 -r1.1.2.22 -r1.1.2.23
--- mod-misc.c 27 Oct 2004 23:32:55 -0000 1.1.2.22
+++ mod-misc.c 22 Dec 2004 23:39:10 -0000 1.1.2.23
@@ -174,6 +174,11 @@
CFG_ITEM_BOOL(Conf, hints.set_xroot_info_on_root_window, 0),
+ CFG_ITEM_INT(Conf, movres.mode_move, 0),
+ CFG_ITEM_INT(Conf, movres.mode_resize, 2),
+ CFG_ITEM_INT(Conf, movres.mode_info, 1),
+ CFG_ITEM_INT(Conf, movres.opacity, 150),
+
CFG_ITEM_BOOL(Conf, place.manual, 0),
CFG_ITEM_BOOL(Conf, place.manual_mouse_pointer, 0),
CFG_ITEM_BOOL(Conf, place.ignore_struts, 0),
@@ -184,9 +189,6 @@
CFG_ITEM_INT(Conf, snap.screen_snap_dist, 32),
CFG_ITEM_INT(Conf, deskmode, MODE_NONE),
- CFG_ITEM_INT(Conf, movemode, 0),
- CFG_ITEM_INT(Conf, resizemode, 2),
- CFG_ITEM_INT(Conf, geominfomode, 1),
CFG_ITEM_INT(Conf, slidemode, 0),
CFG_ITEM_BOOL(Conf, cleanupslide, 1),
CFG_ITEM_BOOL(Conf, mapslide, 0),
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.22.2.17
retrieving revision 1.22.2.18
diff -u -3 -r1.22.2.17 -r1.22.2.18
--- moveresize.c 15 Dec 2004 22:17:10 -0000 1.22.2.17
+++ moveresize.c 22 Dec 2004 23:39:10 -0000 1.22.2.18
@@ -39,16 +39,17 @@
EDBUG_RETURN(0);
mode_moveresize_ewin = ewin;
- move_mode_real = Conf.movemode;
+ move_mode_real = Conf.movres.mode_move;
#if 0 /* Why do this? Let's see what happens if we
don't :) */
- if (((ewin->groups) || (ewin->has_transients)) && (Conf.movemode > 0))
- Conf.movemode = 0;
+ if (((ewin->groups) || (ewin->has_transients))
+ && (Conf.movres.mode_move > 0))
+ Conf.movres.mode_move = 0;
#endif
SoundPlay("SOUND_MOVE_START");
ModulesSignal(ESIGNAL_MOVE_START, NULL);
- if (Conf.movemode > 0)
+ if (Conf.movres.mode_move > 0)
ecore_x_grab();
if (grab)
@@ -76,7 +77,7 @@
FloatEwinAt(gwins[i], EoGetX(gwins[i]), EoGetY(gwins[i]));
#if 0 /* Will never get here */
if (Mode.mode == MODE_MOVE)
- DrawEwinShape(gwins[i], Conf.movemode, EoGetX(gwins[i]),
+ DrawEwinShape(gwins[i], Conf.movres.mode_move, EoGetX(gwins[i]),
EoGetY(gwins[i]), gwins[i]->client.w,
gwins[i]->client.h, 0);
#endif
@@ -108,10 +109,10 @@
ewin = mode_moveresize_ewin;
if (!ewin)
{
- if (Conf.movemode > 0)
+ if (Conf.movres.mode_move > 0)
ecore_x_ungrab();
if (Mode.mode == MODE_MOVE)
- Conf.movemode = move_mode_real;
+ Conf.movres.mode_move = move_mode_real;
EDBUG_RETURN(0);
}
@@ -121,7 +122,7 @@
|| Mode.move.swap, &num);
#if 1 /* Is this OK? */
- if (Conf.movemode == 0)
+ if (Conf.movres.mode_move == 0)
for (i = 0; i < num; i++)
DetermineEwinFloat(gwins[i], 0, 0);
#endif
@@ -129,7 +130,7 @@
if (Mode.mode == MODE_MOVE)
{
for (i = 0; i < num; i++)
- DrawEwinShape(gwins[i], Conf.movemode,
+ DrawEwinShape(gwins[i], Conf.movres.mode_move,
gwins[i]->shape_x, gwins[i]->shape_y,
gwins[i]->client.w, gwins[i]->client.h, 2);
}
@@ -137,7 +138,7 @@
for (i = 0; i < num; i++)
{
- if ((EoIsFloating(gwins[i])) || (Conf.movemode > 0))
+ if ((EoIsFloating(gwins[i])) || (Conf.movres.mode_move > 0))
{
if (EoIsFloating(gwins[i]))
MoveEwinToDesktopAt(gwins[i], d,
@@ -159,11 +160,11 @@
StackDesktop(EoGetDesk(ewin)); /* Restack to "un-float" */
ecore_x_sync();
- if (Conf.movemode > 0)
+ if (Conf.movres.mode_move > 0)
ecore_x_ungrab();
Efree(gwins);
- Conf.movemode = move_mode_real;
+ Conf.movres.mode_move = move_mode_real;
Mode.nogroup = 0;
Mode.move.swap = 0;
Mode.have_place_grab = 0;
@@ -190,7 +191,7 @@
return 0;
/* If non opaque undraw our boxes */
- if (Conf.movemode > 0)
+ if (Conf.movres.mode_move > 0)
{
lst =
ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, Mode.nogroup,
@@ -198,8 +199,8 @@
for (i = 0; i < num; i++)
{
ewin = lst[i];
- DrawEwinShape(ewin, Conf.movemode, ewin->shape_x, ewin->shape_y,
- ewin->client.w, ewin->client.h, 3);
+ DrawEwinShape(ewin, Conf.movres.mode_move, ewin->shape_x,
+ ewin->shape_y, ewin->client.w, ewin->client.h, 3);
}
if (lst)
Efree(lst);
@@ -219,7 +220,7 @@
if (!ewin)
return 0;
- fl = (Conf.movemode == 5) ? 4 : 0;
+ fl = (Conf.movres.mode_move == 5) ? 4 : 0;
if (Mode.mode == MODE_MOVE_PENDING)
{
Mode.mode = MODE_MOVE;
@@ -245,7 +246,7 @@
x += Mode.x - Mode.px;
y += Mode.y - Mode.py;
}
- DrawEwinShape(ewin, Conf.movemode, x, y,
+ DrawEwinShape(ewin, Conf.movres.mode_move, x, y,
ewin->client.w, ewin->client.h, fl);
}
if (lst)
@@ -269,7 +270,7 @@
SoundPlay("SOUND_RESIZE_START");
ModulesSignal(ESIGNAL_RESIZE_START, NULL);
- if (Conf.resizemode > 0)
+ if (Conf.movres.mode_resize > 0)
ecore_x_grab();
Mode.queue_up = 0;
@@ -352,7 +353,7 @@
Mode.win_y = EoGetY(ewin);
Mode.win_w = ewin->client.w;
Mode.win_h = ewin->client.h;
- DrawEwinShape(ewin, Conf.resizemode, EoGetX(ewin), EoGetY(ewin),
+ DrawEwinShape(ewin, Conf.movres.mode_resize, EoGetX(ewin), EoGetY(ewin),
ewin->client.w, ewin->client.h, 0);
EDBUG_RETURN(0);
@@ -375,19 +376,19 @@
ewin = mode_moveresize_ewin;
if (!ewin)
{
- if (Conf.resizemode > 0)
+ if (Conf.movres.mode_resize > 0)
ecore_x_ungrab();
EDBUG_RETURN(0);
}
Mode.queue_up = DRAW_QUEUE_ENABLE;
Mode.mode = MODE_NONE;
- DrawEwinShape(ewin, Conf.resizemode, ewin->shape_x, ewin->shape_y,
+ DrawEwinShape(ewin, Conf.movres.mode_resize, ewin->shape_x, ewin->shape_y,
ewin->client.w, ewin->client.h, 2);
for (i = 0; i < ewin->border->num_winparts; i++)
ewin->bits[i].no_expose = 1;
ecore_x_sync();
- if (Conf.resizemode > 0)
+ if (Conf.movres.mode_resize > 0)
ecore_x_ungrab();
ModulesSignal(ESIGNAL_RESIZE_DONE, NULL);
@@ -420,11 +421,11 @@
for (i = 0; i < num; i++)
{
ewin1 = gwins[i];
- DrawEwinShape(ewin1, Conf.movemode, EoGetX(ewin1),
+ DrawEwinShape(ewin1, Conf.movres.mode_move, EoGetX(ewin1),
EoGetY(ewin1), ewin1->client.w, ewin1->client.h, 0);
}
Mode.mode = MODE_MOVE;
- EoChangeOpacity(ewin, 0xA0000000);
+ EoChangeOpacity(ewin, OpacityExt(Conf.movres.opacity));
}
dx = Mode.x - Mode.px;
@@ -529,11 +530,11 @@
/* if its opaque move mode check to see if we have to float */
/* the window aboe all desktops (reparent to root) */
- if (Conf.movemode == 0)
+ if (Conf.movres.mode_move == 0)
DetermineEwinFloat(ewin1, ndx, ndy);
/* draw the new position of the window */
- DrawEwinShape(ewin1, Conf.movemode,
+ DrawEwinShape(ewin1, Conf.movres.mode_move,
ewin1->shape_x + ndx, ewin1->shape_y + ndy,
ewin1->client.w, ewin1->client.h, 1);
@@ -631,7 +632,7 @@
y = Mode.win_y + Mode.win_h - h;
ewin->client.w = pw;
ewin->client.h = ph;
- DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
+ DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1);
break;
case 1:
ph = ewin->client.h;
@@ -647,7 +648,7 @@
else
y = Mode.win_y + Mode.win_h - h;
ewin->client.h = ph;
- DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
+ DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1);
break;
case 2:
pw = ewin->client.w;
@@ -663,14 +664,14 @@
else
x = Mode.win_x + Mode.win_w - w;
ewin->client.w = pw;
- DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
+ DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1);
break;
case 3:
w = Mode.win_w + (Mode.x - Mode.start_x);
h = Mode.win_h + (Mode.y - Mode.start_y);
x = ewin->shape_x;
y = ewin->shape_y;
- DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
+ DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1);
break;
default:
break;
@@ -694,14 +695,14 @@
else
x = Mode.win_x + Mode.win_w - w;
ewin->client.w = pw;
- DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
+ DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1);
break;
case 1:
w = Mode.win_w + (Mode.x - Mode.start_x);
h = ewin->client.h;
x = ewin->shape_x;
y = ewin->shape_y;
- DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
+ DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1);
break;
default:
break;
@@ -725,14 +726,14 @@
else
y = Mode.win_y + Mode.win_h - h;
ewin->client.h = ph;
- DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
+ DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1);
break;
case 1:
w = ewin->client.w;
h = Mode.win_h + (Mode.y - Mode.start_y);
x = ewin->shape_x;
y = ewin->shape_y;
- DrawEwinShape(ewin, Conf.resizemode, x, y, w, h, 1);
+ DrawEwinShape(ewin, Conf.movres.mode_resize, x, y, w, h, 1);
break;
default:
break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.120.2.11
retrieving revision 1.120.2.12
diff -u -3 -r1.120.2.11 -r1.120.2.12
--- settings.c 2 Oct 2004 12:27:47 -0000 1.120.2.11
+++ settings.c 22 Dec 2004 23:39:10 -0000 1.120.2.12
@@ -322,9 +322,9 @@
if (val < 2)
{
- Conf.movemode = tmp_move;
- Conf.resizemode = tmp_resize;
- Conf.geominfomode = tmp_geominfo;
+ Conf.movres.mode_move = tmp_move;
+ Conf.movres.mode_resize = tmp_resize;
+ Conf.movres.mode_info = tmp_geominfo;
}
if (val)
if ((d =
@@ -484,9 +484,9 @@
}
SoundPlay("SOUND_SETTINGS_MOVERESIZE");
- tmp_move = Conf.movemode;
- tmp_resize = Conf.resizemode;
- tmp_geominfo = Conf.geominfomode;
+ tmp_move = Conf.movres.mode_move;
+ tmp_resize = Conf.movres.mode_resize;
+ tmp_geominfo = Conf.movres.mode_info;
d = DialogCreate("CONFIGURE_MOVERESIZE");
DialogSetTitle(d, _("Move & Resize Settings"));
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.44.2.8
retrieving revision 1.44.2.9
diff -u -3 -r1.44.2.8 -r1.44.2.9
--- startup.c 25 Oct 2004 22:14:23 -0000 1.44.2.8
+++ startup.c 22 Dec 2004 23:39:11 -0000 1.44.2.9
@@ -35,9 +35,8 @@
static ImageClass *ic = NULL;
char pq;
-#if USE_COMPOSITE /* FIXME - Disable for now */
- return;
-#endif
+ if (!Conf.theme.use_startup_background)
+ return;
if (start)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/theme.c,v
retrieving revision 1.37.2.10
retrieving revision 1.37.2.11
diff -u -3 -r1.37.2.10 -r1.37.2.11
--- theme.c 19 Nov 2004 21:02:45 -0000 1.37.2.10
+++ theme.c 22 Dec 2004 23:39:11 -0000 1.37.2.11
@@ -491,6 +491,7 @@
static const CfgItem ThemeCfgItems[] = {
CFG_ITEM_STR(Conf.theme, name),
+ CFG_ITEM_BOOL(Conf.theme, use_startup_background, 1),
};
#define N_CFG_ITEMS (sizeof(ThemeCfgItems)/sizeof(CfgItem))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/tooltips.c,v
retrieving revision 1.65.2.7
retrieving revision 1.65.2.8
diff -u -3 -r1.65.2.7 -r1.65.2.8
--- tooltips.c 15 Dec 2004 22:17:10 -0000 1.65.2.7
+++ tooltips.c 22 Dec 2004 23:39:11 -0000 1.65.2.8
@@ -86,7 +86,7 @@
tt->iwin = ECreateWindow(tt->win, -10, -100, 1, 1, 1);
#if USE_COMPOSITE
eo = EobjRegister(tt->win);
- eo->opacity = Conf_tooltips.opacity;
+ eo->opacity = OpacityExt(Conf_tooltips.opacity);
#endif
for (i = 0; i < 4; i++)
@@ -102,7 +102,7 @@
tt->s_iclass[i]->ref_count++;
#if USE_COMPOSITE
eo = EobjRegister(win);
- eo->opacity = Conf_tooltips.opacity;
+ eo->opacity = OpacityExt(Conf_tooltips.opacity);
#endif
}
tt->s_win[i] = win;
@@ -920,7 +920,7 @@
CFG_ITEM_BOOL(Conf_tooltips, enable, 1),
CFG_ITEM_BOOL(Conf_tooltips, showroottooltip, 1),
CFG_ITEM_INT(Conf_tooltips, delay, 1500),
- CFG_ITEM_INT(Conf_tooltips, opacity, 0xC0000000),
+ CFG_ITEM_INT(Conf_tooltips, opacity, 200),
};
#define N_CFG_ITEMS (sizeof(TooltipsCfgItems)/sizeof(CfgItem))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/x.c,v
retrieving revision 1.71.2.18
retrieving revision 1.71.2.19
diff -u -3 -r1.71.2.18 -r1.71.2.19
--- x.c 15 Dec 2004 22:17:11 -0000 1.71.2.18
+++ x.c 22 Dec 2004 23:39:11 -0000 1.71.2.19
@@ -1146,3 +1146,25 @@
disp = NULL;
}
+
+void
+EDrawableDumpImage(Drawable draw, const char *txt)
+{
+ static int seqn = 0;
+ char buf[1024];
+ Imlib_Image *im;
+ int w, h;
+
+ w = h = 0;
+ GetWinWH(draw, &w, &h);
+ if (w <= 0 || h <= 0)
+ return;
+ imlib_context_set_drawable(draw);
+ im = imlib_create_image_from_drawable(None, 0, 0, w, h, 1);
+ imlib_context_set_image(im);
+ imlib_image_set_format("png");
+ sprintf(buf, "%s-%#lx-%d", txt, draw, seqn++);
+ Eprintf("EDrawableDumpImage: %s\n", buf);
+ imlib_save_image(buf);
+ imlib_free_image_and_decache();
+}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs