Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
backgrounds.c desktops.c events.c ewin-ops.c hints.c icccm.c
ipc.c pager.c
Log Message:
Merge&stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.5.2.13
retrieving revision 1.5.2.14
diff -u -3 -r1.5.2.13 -r1.5.2.14
--- backgrounds.c 20 Oct 2004 21:04:05 -0000 1.5.2.13
+++ backgrounds.c 30 Oct 2004 15:04:27 -0000 1.5.2.14
@@ -1022,19 +1022,10 @@
(Conf.backgrounds.user))
{
if (!bg)
- {
- bg = BackgroundCreate(name, &xclr, bg1, i1, i2,
- i3, i4, i5, i6, bg2, j1,
- j2, j3, j4, j5);
- }
- if (!strcmp(BackgroundGetName(bg), "NONE"))
- {
- DesktopSetBg(atoi(s2), NULL, 0);
- }
- else
- {
- DesktopSetBg(atoi(s2), bg, 0);
- }
+ bg = BackgroundCreate(name, &xclr, bg1, i1, i2,
+ i3, i4, i5, i6, bg2, j1,
+ j2, j3, j4, j5);
+ DesktopSetBg(atoi(s2), bg, 0);
}
}
}
@@ -1046,16 +1037,7 @@
(Conf.backgrounds.user))
{
if (bg)
- {
- if (!strcmp(BackgroundGetName(bg), "NONE"))
- {
- DesktopSetBg(atoi(s2), NULL, 0);
- }
- else
- {
- DesktopSetBg(atoi(s2), bg, 0);
- }
- }
+ DesktopSetBg(atoi(s2), bg, 0);
}
}
}
@@ -1255,7 +1237,8 @@
/* Unviewable desktop - update the virtual root hints */
win = DeskGetWin(j);
- HintsSetRootInfo(win, 0, 0);
+ if (!Conf.hints.set_xroot_info_on_root_window)
+ HintsSetRootInfo(win, 0, 0);
XSetWindowBackground(disp, win, 0);
XClearWindow(disp, win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.95.2.24
retrieving revision 1.95.2.25
diff -u -3 -r1.95.2.24 -r1.95.2.25
--- desktops.c 25 Oct 2004 22:14:19 -0000 1.95.2.24
+++ desktops.c 30 Oct 2004 15:04:27 -0000 1.95.2.25
@@ -673,6 +673,9 @@
if (refresh)
BackgroundPixmapFree(desks.desk[desk].bg);
+ if (bg && !strcmp(BackgroundGetName(bg), "NONE"))
+ bg = NULL;
+
if (desks.desk[desk].bg != bg)
{
if (desks.desk[desk].bg)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.69.2.16
retrieving revision 1.69.2.17
diff -u -3 -r1.69.2.16 -r1.69.2.17
--- events.c 27 Oct 2004 23:32:52 -0000 1.69.2.16
+++ events.c 30 Oct 2004 15:04:27 -0000 1.69.2.17
@@ -906,15 +906,24 @@
case_common:
Eprintf("#%08lx EV-%s win=%#lx\n", ser, name, win);
break;
- default:
- if (ev->type == event_base_shape + ShapeNotify)
- Eprintf("#%08lx EV-ShapeNotify win=%#lx\n", ser, win);
+ case EX_EVENT_SHAPE_NOTIFY:
+ Eprintf("#%08lx EV-%s win=%#lx\n", ser, name, win);
+ break;
#ifdef USE_XRANDR
- else if (ev->type == event_base_randr + RRScreenChangeNotify)
- Eprintf("#%08lx EV-RRScreenChangeNotify win=%#lx\n", ser, win);
+ case EX_EVENT_SCREEN_CHANGE_NOTIFY:
+ Eprintf("#%08lx EV-%s win=%#lx\n", ser, name, win);
+ break;
#endif
- else
- Eprintf("#%08lx EV-%s win=%#lx\n", ser, name, win);
+#ifdef 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,
+ de->area.x, de->area.y, de->area.width, de->area.height);
+ break;
+#undef de
+#endif
+ default:
+ Eprintf("#%08lx EV-%s win=%#lx\n", ser, name, win);
break;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ewin-ops.c,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -3 -r1.1.2.16 -r1.1.2.17
--- ewin-ops.c 25 Oct 2004 22:14:22 -0000 1.1.2.16
+++ ewin-ops.c 30 Oct 2004 15:04:27 -0000 1.1.2.17
@@ -318,7 +318,7 @@
if (ewin->props.inhibit_iconify)
EDBUG_RETURN_;
- if (ewin->state == EWIN_STATE_ICONIC)
+ if (ewin->state != EWIN_STATE_MAPPED)
EDBUG_RETURN_;
if (call_depth > 256)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/hints.c,v
retrieving revision 1.25.2.4
retrieving revision 1.25.2.5
diff -u -3 -r1.25.2.4 -r1.25.2.5
--- hints.c 23 Oct 2004 14:23:39 -0000 1.25.2.4
+++ hints.c 30 Oct 2004 15:04:27 -0000 1.25.2.5
@@ -53,8 +53,6 @@
XChangeProperty(disp, VRoot.win, atom, XA_STRING, 8, PropModeReplace,
(unsigned char *)e_wm_version, strlen(e_wm_version));
- Conf.hints.set_xroot_info_on_root_window = 0;
-
EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.76.2.12
retrieving revision 1.76.2.13
diff -u -3 -r1.76.2.12 -r1.76.2.13
--- icccm.c 23 Oct 2004 15:36:28 -0000 1.76.2.12
+++ icccm.c 30 Oct 2004 15:04:27 -0000 1.76.2.13
@@ -84,8 +84,7 @@
if (event->data.l[0] == IconicState)
{
- if (!(ewin->iconified))
- EwinIconify(ewin);
+ EwinIconify(ewin);
}
}
else if (event->message_type == _ecore_x_atom_wm_protocols)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.174.2.30
retrieving revision 1.174.2.31
diff -u -3 -r1.174.2.30 -r1.174.2.31
--- ipc.c 27 Oct 2004 23:32:52 -0000 1.174.2.30
+++ ipc.c 30 Oct 2004 15:04:28 -0000 1.174.2.31
@@ -1191,11 +1191,9 @@
static void
IPC_Hints(const char *params, Client * c)
{
- char buf[FILEPATH_LEN_MAX];
char param1[FILEPATH_LEN_MAX];
char param2[FILEPATH_LEN_MAX];
- buf[0] = 0;
param1[0] = 0;
param2[0] = 0;
@@ -1208,12 +1206,11 @@
Conf.hints.set_xroot_info_on_root_window = 0;
else if (!strncmp(param2, "root", 4))
Conf.hints.set_xroot_info_on_root_window = 1;
+ autosave();
}
- Esnprintf(buf, sizeof(buf), "Set _XROOT* hints: %s",
+ IpcPrintf("Set _XROOT* hints: %s\n",
(Conf.hints.set_xroot_info_on_root_window) ? "root" : "normal");
-
- CommsSend(c, buf);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.103.2.20
retrieving revision 1.103.2.21
diff -u -3 -r1.103.2.20 -r1.103.2.21
--- pager.c 25 Oct 2004 22:14:23 -0000 1.103.2.20
+++ pager.c 30 Oct 2004 15:04:29 -0000 1.103.2.21
@@ -2356,11 +2356,11 @@
* Configuration items
*/
static const CfgItem PagersCfgItems[] = {
- CFG_ITEM_BOOL(Conf.pagers, enable, 1), /* FIXME - PagersShow */
+ CFG_ITEM_BOOL(Conf.pagers, enable, 1),
CFG_ITEM_BOOL(Conf.pagers, zoom, 1),
CFG_ITEM_BOOL(Conf.pagers, title, 1),
- CFG_ITEM_BOOL(Conf.pagers, hiq, 1), /* FIXME - PagerSetHiQ */
- CFG_ITEM_BOOL(Conf.pagers, snap, 1), /* FIXME - PagerSetSnap */
+ CFG_ITEM_BOOL(Conf.pagers, hiq, 1),
+ CFG_ITEM_BOOL(Conf.pagers, snap, 1),
CFG_ITEM_INT(Conf.pagers, scanspeed, 10),
CFG_ITEM_INT(Conf.pagers, sel_button, 2),
CFG_ITEM_INT(Conf.pagers, win_button, 1),
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
