Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h events.c evhandlers.c fx.c pager.c zoom.c
Log Message:
Assorted trivial fixups and minor changes.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- E.h 9 Jan 2004 09:11:33 -0000 1.174
+++ E.h 10 Jan 2004 13:40:59 -0000 1.175
@@ -2705,6 +2705,7 @@
void DisablePagersForDesktop(int desk);
Window PagerGetWin(Pager * p);
Window PagerGetHiWin(Pager * p);
+void PagerEventUnmap(Pager * p);
int PagersEventMotion(XEvent * ev);
int PagersEventMouseDown(XEvent * ev);
int PagersEventMouseUp(XEvent * ev);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/events.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- events.c 4 Jan 2004 18:07:18 -0000 1.41
+++ events.c 10 Jan 2004 13:40:59 -0000 1.42
@@ -975,4 +975,4 @@
{
}
-#endif /* INCLUDE_DEBUG_STUFF */
+#endif /* ENABLE_DEBUG_EVENTS */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- evhandlers.c 9 Jan 2004 09:11:33 -0000 1.135
+++ evhandlers.c 10 Jan 2004 13:40:59 -0000 1.136
@@ -862,15 +862,8 @@
ewin = RemoveItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
if (ewin)
{
- Pager *p;
-
- p = FindPager(ev->xdestroywindow.window);
- if (p)
- {
- PagerHideHi(p);
- mode.mode = MODE_NONE;
- mode.context_pager = NULL;
- }
+ if (ewin->pager)
+ PagerEventUnmap(ewin->pager);
if (ewin->iconified > 0)
RemoveMiniIcon(ewin);
@@ -1144,21 +1137,16 @@
void
HandleUnmap(XEvent * ev)
{
- Window win;
+ Window win = ev->xunmap.window;
EWin *ewin;
int i, num_groups;
EDBUG(5, "HandleUnmap");
- win = ev->xunmap.window;
ewin = FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
if (ewin)
{
if (ewin->pager)
- {
- PagerHideHi(ewin->pager);
- mode.mode = MODE_NONE;
- mode.context_pager = NULL;
- }
+ PagerEventUnmap(ewin->pager);
if (mode.dockapp_support && ewin->docked)
DockDestroy(ewin);
@@ -1181,15 +1169,18 @@
break;
}
}
+
if (ewin == mode.focuswin)
FocusToEWin(NULL);
if (ewin == mode.mouse_over_win)
mode.mouse_over_win = NULL;
if (ewin == mode.ewin)
mode.ewin = NULL;
+
num_groups = ewin->num_groups;
for (i = 0; i < num_groups; i++)
RemoveEwinFromGroup(ewin, ewin->groups[0]);
+
if (!ewin->iconified)
{
XTranslateCoordinates(disp, ewin->client.win, root.win,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/fx.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- fx.c 15 Nov 2003 22:27:17 -0000 1.32
+++ fx.c 10 Jan 2004 13:40:59 -0000 1.33
@@ -237,15 +237,15 @@
static char before = 0;
if (!before)
- DIALOG_OK(_("Starting up Ripples FX..."),
- _("\n" "You have just started the Ripples Effect.\n" "\n"
- "If you look closely on your desktop background, and if it\n"
- "doesn't have a solid colour (i.e. has a background texture or\n"
- "image), you will see a pool of water at the bottom of your\n"
- "screen that reflects everything above it and \"ripples\".\n"
- "\n"
- "To disable this effect just select this option again to toggle\n"
- "it off.\n"));
+ DialogOK(_("Starting up Ripples FX..."),
+ _("\n" "You have just started the Ripples Effect.\n" "\n"
+ "If you look closely on your desktop background, and if it\n"
+ "doesn't have a solid colour (i.e. has a background texture or\n"
+ "image), you will see a pool of water at the bottom of your\n"
+ "screen that reflects everything above it and \"ripples\".\n"
+ "\n"
+ "To disable this effect just select this option again to toggle\n"
+ "it off.\n"));
before = 1;
#endif
}
@@ -383,16 +383,16 @@
static char before = 0;
if (!before)
- DIALOG_OK(_("Starting up Raindrops FX..."),
- _("\n" "You have just started the Raindrops Effect.\n"
- "\n"
- "If you look closely on your desktop background, and if it\n"
- "doesn't have a solid colour (i.e. has a background texture or\n"
- "image), you will see \"raindrops\" hit the background and\n"
- "make little splashes. This Effect can be VERY CPU intensive.\n"
- "\n"
- "To disable this effect just select this option again to toggle\n"
- "it off.\n"));
+ DialogOK(_("Starting up Raindrops FX..."),
+ _("\n" "You have just started the Raindrops Effect.\n"
+ "\n"
+ "If you look closely on your desktop background, and if it\n"
+ "doesn't have a solid colour (i.e. has a background texture or\n"
+ "image), you will see \"raindrops\" hit the background and\n"
+ "make little splashes. This Effect can be VERY CPU intensive.\n"
+ "\n"
+ "To disable this effect just select this option again to toggle\n"
+ "it off.\n"));
before = 1;
#endif
}
@@ -414,33 +414,33 @@
#if !USE_IMLIB2
if (!pImlib_Context->x.shm)
{
- DIALOG_OK(_("Unable to display raindrops"),
- _("\n"
- "Enlightenment is unable to display raindrops on this\n"
- "display because Shared memory is not available on this\n"
- "X-Server.\n" "\n"
- "This may be due to Enlightenment being a remote client\n"
- "running over the network, a MIT-SHM incapable X-server,\n"
- "having run out of SHM ID's on the system or Shared\n"
- "Memory support being turned off in Imlib\n" "\n"
- "You may correct this by either running `imlib_config'\n"
- "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n"
- "and editing it, enabling shared memory.\n" "\n"));
+ DialogOK(_("Unable to display raindrops"),
+ _("\n"
+ "Enlightenment is unable to display raindrops on this\n"
+ "display because Shared memory is not available on this\n"
+ "X-Server.\n" "\n"
+ "This may be due to Enlightenment being a remote client\n"
+ "running over the network, a MIT-SHM incapable X-server,\n"
+ "having run out of SHM ID's on the system or Shared\n"
+ "Memory support being turned off in Imlib\n" "\n"
+ "You may correct this by either running `imlib_config'\n"
+ "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n"
+ "and editing it, enabling shared memory.\n" "\n"));
return;
}
if (!pImlib_Context->x.shmp)
{
- DIALOG_OK(_("Unable to display raindrops"),
- _("\n"
- "Enlightenment is unable to display raindrops on this\n"
- "display because shared pixmaps are not available on this\n"
- "X-Server.\n" "\n"
- "This may be due to either the X-Server not implementing\n"
- "shared pixmaps, or shared pixmaps being disabled in\n"
- "Imlib's configuration.\n" "\n"
- "You may correct this by either running `imlib_config'\n"
- "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n"
- "and editing it, enabling shared pixmaps.\n" "\n"));
+ DialogOK(_("Unable to display raindrops"),
+ _("\n"
+ "Enlightenment is unable to display raindrops on this\n"
+ "display because shared pixmaps are not available on this\n"
+ "X-Server.\n" "\n"
+ "This may be due to either the X-Server not implementing\n"
+ "shared pixmaps, or shared pixmaps being disabled in\n"
+ "Imlib's configuration.\n" "\n"
+ "You may correct this by either running `imlib_config'\n"
+ "or copying the system imrc (/usr/etc/imrc) to ~/.imrc\n"
+ "and editing it, enabling shared pixmaps.\n" "\n"));
return;
}
#endif
@@ -702,15 +702,15 @@
static char before = 0;
if (!before)
- DIALOG_OK(_("Starting up Waves FX..."),
- _("\n" "You have just started the Waves Effect.\n" "\n"
- "If you look closely on your desktop background, and if it\n"
- "doesn't have a solid colour (i.e. has a background texture or\n"
- "image), you will see a pool of water at the bottom of your\n"
- "screen that reflects everything above it and \"waves\".\n"
- "\n"
- "To disable this effect just select this option again to toggle\n"
- "it off.\n"));
+ DialogOK(_("Starting up Waves FX..."),
+ _("\n" "You have just started the Waves Effect.\n" "\n"
+ "If you look closely on your desktop background, and if it\n"
+ "doesn't have a solid colour (i.e. has a background texture or\n"
+ "image), you will see a pool of water at the bottom of your\n"
+ "screen that reflects everything above it and \"waves\".\n"
+ "\n"
+ "To disable this effect just select this option again to toggle\n"
+ "it off.\n"));
before = 1;
#endif
}
@@ -888,11 +888,11 @@
static char before = 0;
if (!before)
- DIALOG_OK(_("Starting up imagespinners FX..."),
- _("\n" "You have just started the imagespinners Effect.\n"
- "\n"
- "To disable this effect just select this option again to toggle\n"
- "it off.\n"));
+ DialogOK(_("Starting up imagespinners FX..."),
+ _("\n" "You have just started the imagespinners Effect.\n"
+ "\n"
+ "To disable this effect just select this option again to toggle\n"
+ "it off.\n"));
before = 1;
#endif
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- pager.c 3 Jan 2004 12:29:58 -0000 1.54
+++ pager.c 10 Jan 2004 13:40:59 -0000 1.55
@@ -117,45 +117,45 @@
if (XShmPixmapFormat(disp) != ZPixmap)
{
SettingsPager();
- DIALOG_OK(_("Warning!"),
- _("\n"
- "You seem to have an X Server capable of Shared
Memory\n"
- "but it is incapable of doing ZPixmap Shared
pixmaps\n"
- "(The server does not claim to be able to do
them).\n"
- "\n"
- "The pager in Enlightenment will run slowly in
snapshot\n"
- "mode if you continue to use that mode of the
pager\n"
- "under these conditions.\n" "\n"
- "It is suggested you change the settings on your
pager to\n"
- "disable snapshots to improve performance.\n"
- "\n"));
+ DialogOK(_("Warning!"),
+ _("\n"
+ "You seem to have an X Server capable of Shared
Memory\n"
+ "but it is incapable of doing ZPixmap Shared
pixmaps\n"
+ "(The server does not claim to be able to do
them).\n"
+ "\n"
+ "The pager in Enlightenment will run slowly in
snapshot\n"
+ "mode if you continue to use that mode of the
pager\n"
+ "under these conditions.\n" "\n"
+ "It is suggested you change the settings on your
pager to\n"
+ "disable snapshots to improve performance.\n"
+ "\n"));
}
else
- DIALOG_OK(_("Warning!"),
- _("\n"
- "Your X Server is capable of doing Shared Memory but
you do\n"
- "not have Shared Pixmaps enabled in your Imlib
configuration.\n"
- "\n"
- "Please enable Shared Pixmaps in your Imlib
configuration\n"
- "then restart Enlightenment to gain better
performance for\n"
- "the pagers when snapshot mode is enabled.\n"
- "\n"));
+ DialogOK(_("Warning!"),
+ _("\n"
+ "Your X Server is capable of doing Shared Memory but
you do\n"
+ "not have Shared Pixmaps enabled in your Imlib
configuration.\n"
+ "\n"
+ "Please enable Shared Pixmaps in your Imlib
configuration\n"
+ "then restart Enlightenment to gain better performance
for\n"
+ "the pagers when snapshot mode is enabled.\n"
+ "\n"));
}
}
else
{
SettingsPager();
- DIALOG_OK(_("Warning!"),
- _("\n"
- "You seem to be running Enlightenment over a network
Connection\n"
- "or on an X Server that does not support Shared Memory, or
you\n"
- "have disabled MIT-SHM Shared memory in your Imlib
configuration.\n"
- "This means the Enlightenment Pager will perform slowly and
use\n"
- "more system resources than it would when Shared Memory is\n"
- "available.\n" "\n"
- "To improve performance please either enable MIT-SHM Shared
Memory\n"
- "in your Imlib config, if you disabled it, or disable Pager\n"
- "snapshots.\n" "\n"));
+ DialogOK(_("Warning!"),
+ _("\n"
+ "You seem to be running Enlightenment over a network
Connection\n"
+ "or on an X Server that does not support Shared Memory, or
you\n"
+ "have disabled MIT-SHM Shared memory in your Imlib
configuration.\n"
+ "This means the Enlightenment Pager will perform slowly and
use\n"
+ "more system resources than it would when Shared Memory is\n"
+ "available.\n" "\n"
+ "To improve performance please either enable MIT-SHM Shared
Memory\n"
+ "in your Imlib config, if you disabled it, or disable Pager\n"
+ "snapshots.\n" "\n"));
}
#endif
did_dialog = 1;
@@ -1528,6 +1528,17 @@
*/
static int *gwin_px, *gwin_py;
+
+void
+PagerEventUnmap(Pager * p)
+{
+ PagerHideHi(p);
+ if (p == mode.context_pager)
+ {
+ mode.context_pager = NULL;
+ mode.mode = MODE_NONE;
+ }
+}
int
PagersEventMotion(XEvent * ev)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/zoom.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- zoom.c 5 Nov 2003 17:24:47 -0000 1.16
+++ zoom.c 10 Jan 2004 13:40:59 -0000 1.17
@@ -209,13 +209,13 @@
MoveEwin(ewin, zoom_last_x, zoom_last_y);
ICCCM_Configure(ewin);
if (zoom_mask_1)
- XDestroyWindow(disp, zoom_mask_1);
+ EDestroyWindow(disp, zoom_mask_1);
if (zoom_mask_2)
- XDestroyWindow(disp, zoom_mask_2);
+ EDestroyWindow(disp, zoom_mask_2);
if (zoom_mask_3)
- XDestroyWindow(disp, zoom_mask_3);
+ EDestroyWindow(disp, zoom_mask_3);
if (zoom_mask_4)
- XDestroyWindow(disp, zoom_mask_4);
+ EDestroyWindow(disp, zoom_mask_4);
SwitchRes(0, 0, 0, 0, 0);
XWarpPointer(disp, None, ewin->client.win, 0, 0, 0, 0,
ewin->client.w / 2, ewin->client.h / 2);
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
