parent
018408379a
commit
937be0bb74
|
@ -1120,13 +1120,7 @@ BackgroundsConfigLoadUser(void)
|
|||
char s[4096];
|
||||
|
||||
Esnprintf(s, sizeof(s), "%s.backgrounds", EGetSavePrefix());
|
||||
if (ConfigFileLoad(s, NULL, ConfigFileRead, 0))
|
||||
{
|
||||
/* FIXME - Keep around a bit, and then remove */
|
||||
Esnprintf(s, sizeof(s), "%s.misc", EGetSavePrefix());
|
||||
Eprintf("Fallback - loading %s\n", s);
|
||||
ConfigFileLoad(s, NULL, ConfigFileRead, 0);
|
||||
}
|
||||
ConfigFileLoad(s, NULL, ConfigFileRead, 0);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -385,7 +385,6 @@ EobjSlideTo(EObj * eo, int fx, int fy, int tx, int ty, int speed)
|
|||
x = ((fx * (1024 - k)) + (tx * k)) >> 10;
|
||||
y = ((fy * (1024 - k)) + (ty * k)) >> 10;
|
||||
EobjMove(eo, x, y);
|
||||
ecore_x_sync();
|
||||
|
||||
k = ETimedLoopNext();
|
||||
}
|
||||
|
@ -425,7 +424,6 @@ EobjsSlideBy(EObj ** peo, int num, int dx, int dy, int speed)
|
|||
y = ((xy[i].y * (1024 - k)) + ((xy[i].y + dy) * k)) >> 10;
|
||||
EobjMove(peo[i], x, y);
|
||||
}
|
||||
ecore_x_sync();
|
||||
|
||||
k = ETimedLoopNext();
|
||||
}
|
||||
|
|
|
@ -111,13 +111,12 @@ SlideEwinTo(EWin * ewin, int fx, int fy, int tx, int ty, int speed)
|
|||
tmpx = x;
|
||||
tmpy = y;
|
||||
if (Conf.slidemode == 0)
|
||||
EMoveWindow(EoGetWin(ewin), tmpx, tmpy);
|
||||
EoMove(ewin, tmpx, tmpy);
|
||||
else
|
||||
DrawEwinShape(ewin, Conf.slidemode, tmpx, tmpy,
|
||||
ewin->client.w, ewin->client.h, firstlast);
|
||||
if (firstlast == 0)
|
||||
firstlast = 1;
|
||||
ecore_x_sync();
|
||||
|
||||
k = ETimedLoopNext();
|
||||
}
|
||||
|
@ -166,12 +165,11 @@ SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx, int *ty, int num_wins,
|
|||
tmpw = ewin[i]->client.w;
|
||||
tmph = ewin[i]->client.h;
|
||||
if (ewin[i]->type == EWIN_TYPE_MENU)
|
||||
EMoveWindow(EoGetWin(ewin[i]), tmpx, tmpy);
|
||||
EoMove(ewin[i], tmpx, tmpy);
|
||||
else
|
||||
DrawEwinShape(ewin[i], 0, tmpx, tmpy, tmpw, tmph, firstlast);
|
||||
if (firstlast == 0)
|
||||
firstlast = 1;
|
||||
ecore_x_sync();
|
||||
}
|
||||
/* We may loop faster here than originally intended */
|
||||
k = ETimedLoopNext();
|
||||
|
|
40
src/ewins.c
40
src/ewins.c
|
@ -1920,46 +1920,6 @@ EwinHandleEventsClient(XEvent * ev, void *prm)
|
|||
EwinEventVisibility(ewin, ev->xvisibility.state);
|
||||
break;
|
||||
|
||||
#if 0 /* FIXME - Remove? */
|
||||
case DestroyNotify:
|
||||
EwinEventDestroy(ewin);
|
||||
break;
|
||||
case UnmapNotify:
|
||||
#if 0
|
||||
if (ewin->state == EWIN_STATE_NEW)
|
||||
{
|
||||
Eprintf("EwinEventUnmap %#lx: Ignoring bogus Unmap event\n",
|
||||
ewin->client.win);
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
EwinEventUnmap(ewin);
|
||||
break;
|
||||
case MapNotify:
|
||||
EwinEventMap(ewin);
|
||||
break;
|
||||
case ReparentNotify:
|
||||
/* Check if window parent hasn't changed already (compress?) */
|
||||
if (WinGetParent(ev->xreparent.window) != ev->xreparent.parent)
|
||||
break;
|
||||
if (ev->xreparent.parent == VRoot.win)
|
||||
EwinEventDestroy(ewin);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
case ConfigureRequest:
|
||||
if (ev->xconfigurerequest.window == ewin->client.win)
|
||||
EwinEventConfigureRequest(ewin, ev);
|
||||
break;
|
||||
case ResizeRequest:
|
||||
if (ev->xresizerequest.window == ewin->client.win)
|
||||
EwinEventResizeRequest(ewin, ev);
|
||||
break;
|
||||
case CirculateRequest:
|
||||
EwinEventCirculateRequest(ewin, ev);
|
||||
break;
|
||||
#endif
|
||||
case PropertyNotify:
|
||||
EwinEventPropertyNotify(ewin, ev);
|
||||
break;
|
||||
|
|
|
@ -53,7 +53,6 @@ SlideWindowSizeTo(Window win, int fx, int fy, int tx, int ty, int fw, int fh,
|
|||
w = ((fw * (1024 - k)) + (tw * k)) >> 10;
|
||||
h = ((fh * (1024 - k)) + (th * k)) >> 10;
|
||||
EMoveResizeWindow(win, x, y, w, h);
|
||||
ecore_x_sync();
|
||||
|
||||
k = ETimedLoopNext();
|
||||
}
|
||||
|
|
|
@ -138,7 +138,6 @@ StartupWindowsOpen(void)
|
|||
|
||||
EobjMove(init_win1, -x - xOffset, -y - yOffset);
|
||||
EobjMove(init_win2, x + xOffset, y + yOffset);
|
||||
ecore_x_sync();
|
||||
|
||||
k = ETimedLoopNext();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue