Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h kde.c
Log Message:
kde.c cleanups: Remove some unused functions, make local functions static.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- E.h 21 Jun 2003 10:39:20 -0000 1.121
+++ E.h 11 Jul 2003 17:12:11 -0000 1.122
@@ -2390,23 +2390,11 @@
#if ENABLE_KDE
/* kde.c functions */
-void KDE_ClientMessage(Window win, Atom atom, long data,
- Time timestamp);
-void KDE_ClientTextMessage(Window win, Atom atom, char *data);
-void KDE_SendMessagesToModules(Atom atom, long data);
-void KDE_AddModule(Window win);
-void KDE_RemoveModule(Window win);
void KDE_Init(void);
void KDE_Shutdown(void);
-void KDE_ClientInit(Window win);
+void KDE_RemoveModule(Window win);
void KDE_ClientChange(Window win, Atom a);
-void KDE_GetDecorationHint(Window win, long *dechints);
-int KDE_WindowCommand(EWin * ewin, char *cmd);
-void KDE_Command(char *cmd, XClientMessageEvent * event);
void KDE_ProcessClientMessage(XClientMessageEvent * event);
-void KDE_ModuleAssert(Window win);
-void KDE_PrepModuleEvent(Window win, KMessage msg);
-void KDE_CheckClientHints(Window win);
void KDE_HintChange(Atom a);
void KDE_SetRootArea(void);
void KDE_UpdateFocusedWindow(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/kde.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- kde.c 22 May 2003 19:15:01 -0000 1.72
+++ kde.c 11 Jul 2003 17:12:12 -0000 1.73
@@ -98,7 +98,7 @@
static KModuleList *KModules = NULL;
-void
+static void
KDE_ClientMessage(Window win, Atom atom, long data, Time timestamp)
{
@@ -121,7 +121,7 @@
}
-void
+static void
KDE_ClientTextMessage(Window win, Atom atom, char *data)
{
@@ -143,7 +143,7 @@
}
-void
+static void
KDE_SendMessagesToModules(Atom atom, long data)
{
@@ -297,7 +297,7 @@
}
-void
+static void
KDE_AddModule(Window win)
{
@@ -679,34 +679,70 @@
}
-void
-KDE_ClientInit(Window win)
+static void
+KDE_GetDecorationHint(Window win, long *dechints)
{
+ Border *b = NULL;
EWin *ewin;
- EDBUG(6, "KDE_ClientInit");
+ EDBUG(6, "KDE_GetDecorationHint");
ewin = FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
- /* grab everything from the Client about KStuffs */
- if (getSimpleHint(win, KDE_WIN_STICKY))
- {
- MakeWindowSticky(ewin);
- }
- if (getSimpleHint(win, KDE_WIN_ICONIFIED))
- {
- IconifyEwin(ewin);
- }
- if (getSimpleHint(win, KDE_WIN_MAXIMIZED))
+ if (!ewin)
+ EDBUG_RETURN_;
+
+ if (*dechints & KDE_NO_FOCUS)
+ ewin->skipfocus = 1;
+
+ switch (*dechints & ~KDE_NO_FOCUS)
{
- MaxSize(ewin, "conservative");
+ case KDE_NO_DECORATION:
+ b = (Border *) FindItem("BORDERLESS", 0, LIST_FINDBY_NAME,
+ LIST_TYPE_BORDER);
+ break;
+ case KDE_TINY_DECORATION:
+ b = (Border *) FindItem("TRANSIENT", 0, LIST_FINDBY_NAME,
+ LIST_TYPE_BORDER);
+ break;
+ case KDE_STANDALONE_MENUBAR:
+ b = (Border *) FindItem("BORDERLESS", 0, LIST_FINDBY_NAME,
+ LIST_TYPE_BORDER);
+ ewin->skipfocus = 1;
+ break;
+ case KDE_DESKTOP_ICON:
+ b = (Border *) FindItem("BORDERLESS", 0, LIST_FINDBY_NAME,
+ LIST_TYPE_BORDER);
+ ewin->skipfocus = 1;
+ ewin->sticky = 1;
+ ewin->layer = 1;
+ break;
+ case KDE_ONTOP:
+ ewin->layer = 11;
+ break;
+ case KDE_NORMAL_DECORATION:
+ default:
+ b = (Border *) FindItem("DEFAULT", 0, LIST_FINDBY_NAME,
+ LIST_TYPE_BORDER);
+ break;
+
}
- if (getSimpleHint(win, KDE_WIN_DECORATION))
+ if (!b)
{
- KDE_GetDecorationHint(win, getSimpleHint(win, KDE_WIN_DECORATION));
+ b = (Border *) FindItem("DEFAULT", 0, LIST_FINDBY_NAME,
+ LIST_TYPE_BORDER);
+ if (!b)
+ {
+ b = (Border *) FindItem("__FALLBACK_BORDER", 0, LIST_FINDBY_NAME,
+ LIST_TYPE_BORDER);
+
+ }
}
- /* we currently do not support the GEOMETRY RESTORE HINT */
+ ewin->border_new = 1;
+ SetEwinToBorder(ewin, b);
+ ICCCM_MatchSize(ewin);
+ MoveResizeEwin(ewin, ewin->x, ewin->y, ewin->client.w, ewin->client.h);
EDBUG_RETURN_;
@@ -805,99 +841,7 @@
}
-void
-KDE_GetDecorationHint(Window win, long *dechints)
-{
-
- Border *b = NULL;
- EWin *ewin;
-
- EDBUG(6, "KDE_GetDecorationHint");
-
- ewin = FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
-
- if (!ewin)
- EDBUG_RETURN_;
-
- if (*dechints & KDE_NO_FOCUS)
- ewin->skipfocus = 1;
-
- switch (*dechints & ~KDE_NO_FOCUS)
- {
- case KDE_NO_DECORATION:
- b = (Border *) FindItem("BORDERLESS", 0, LIST_FINDBY_NAME,
- LIST_TYPE_BORDER);
- break;
- case KDE_TINY_DECORATION:
- b = (Border *) FindItem("TRANSIENT", 0, LIST_FINDBY_NAME,
- LIST_TYPE_BORDER);
- break;
- case KDE_STANDALONE_MENUBAR:
- b = (Border *) FindItem("BORDERLESS", 0, LIST_FINDBY_NAME,
- LIST_TYPE_BORDER);
- ewin->skipfocus = 1;
- break;
- case KDE_DESKTOP_ICON:
- b = (Border *) FindItem("BORDERLESS", 0, LIST_FINDBY_NAME,
- LIST_TYPE_BORDER);
- ewin->skipfocus = 1;
- ewin->sticky = 1;
- ewin->layer = 1;
- break;
- case KDE_ONTOP:
- ewin->layer = 11;
- break;
- case KDE_NORMAL_DECORATION:
- default:
- b = (Border *) FindItem("DEFAULT", 0, LIST_FINDBY_NAME,
- LIST_TYPE_BORDER);
- break;
-
- }
- if (!b)
- {
- b = (Border *) FindItem("DEFAULT", 0, LIST_FINDBY_NAME,
- LIST_TYPE_BORDER);
- if (!b)
- {
- b = (Border *) FindItem("__FALLBACK_BORDER", 0, LIST_FINDBY_NAME,
- LIST_TYPE_BORDER);
-
- }
- }
- ewin->border_new = 1;
- SetEwinToBorder(ewin, b);
- ICCCM_MatchSize(ewin);
- MoveResizeEwin(ewin, ewin->x, ewin->y, ewin->client.w, ewin->client.h);
-
- EDBUG_RETURN_;
-
-}
-
-void
-KDE_CheckClientHints(Window win)
-{
-
- EDBUG(6, "KDE_CheckClientHints");
-
- if (getSimpleHint(win, KDE_WIN_DECORATION))
- {
- KDE_GetDecorationHint(win, getSimpleHint(win, KDE_WIN_DECORATION));
- }
- if (getSimpleHint(win, KDE_WIN_DESKTOP))
- {
- EWin *ewin;
-
- ewin = FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
- if (!ewin)
- EDBUG_RETURN_;
- ewin->desktop = *(getSimpleHint(win, KDE_WIN_DESKTOP)) - 1;
- }
- EDBUG_RETURN_;
-
-}
-
-int
+static int
KDE_WindowCommand(EWin * ewin, char *cmd)
{
@@ -953,7 +897,7 @@
}
-void
+static void
KDE_Command(char *cmd, XClientMessageEvent * event)
{
@@ -1091,69 +1035,6 @@
else
{
/* not supported right now */
- }
-
- EDBUG_RETURN_;
-
-}
-
-void
-KDE_ModuleAssert(Window win)
-{
-
- EDBUG(6, "KDE_ModuleAssert");
-
- if (*(getSimpleHint(win, KDE_MODULE)))
- {
- KDE_AddModule(win);
- }
- EDBUG_RETURN_;
-
-}
-
-void
-KDE_PrepModuleEvent(Window win, KMessage msg)
-{
-
- Atom event;
-
- EDBUG(6, "KDE_PrepModuleEvent");
-
- switch (msg)
- {
- case AddWindow:
- event = KDE_MODULE_WIN_ADD;
- break;
- case RemoveWindow:
- event = KDE_MODULE_WIN_REMOVE;
- break;
- case FocusWindow:
- event = KDE_MODULE_WIN_ACTIVATE;
- break;
- case RaiseWindow:
- event = KDE_MODULE_WIN_RAISE;
- break;
- case LowerWindow:
- event = KDE_MODULE_WIN_LOWER;
- break;
- case ChangedClient:
- event = KDE_MODULE_WIN_CHANGE;
- break;
- case IconChange:
- event = KDE_MODULE_WIN_ICON_CHANGE;
- break;
- default:
- EDBUG_RETURN_;
-
- }
-
- if (win)
- {
- KDE_SendMessagesToModules(event, win);
- }
- else
- {
- KDE_SendMessagesToModules(event, 0);
}
EDBUG_RETURN_;
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
