e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Bye bye KDE(1). 

SVN revision: 7825
This commit is contained in:
Kim Woelders 2003-11-08 10:56:25 +00:00
parent afd12a9a41
commit a619f8b193
37 changed files with 3505 additions and 5341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
FAQ
View File

@ -73,60 +73,6 @@ A: As described above, ALT + Right mouse button will give you the
window operations menu, ALT + Middle mouse button will resize the
iconbox and ALT+left mouse button will move it.
-------------------------------------------------------------------------------
Q: How do I set up Enlightenment to work with GNOME?
A: By default, Enlightenment supports all of the GNOME hints. However, if you
want to run GMC you may notice that clicking on the root window does not
always have the desired effect (for dragging icons, GMC's root menus, etc).
If you want to use GMC with enlightenment, there are a couple of options. You
can use alt+leftmouse and alt+rightmouse to use the GMC root menus. Or, you
can edit the keybindings.cfg file to remove the bindings for your left and
right
mousebuttons. There is a copy of keybindings.cfg that will do this for you
that comes with enlightenment. in /path/to/enlightenment/configs/
copy the keybindings.gmc.cfg into your ~/.enlightenment directory. When you
restart, you will no longer have the left and right mousebuttons bound to
enlightenment. To modify your system configuration, copy over the
keybindings.cfg file in that directory. For your convenience, there is a
keybindings.nogmc.cfg in case you want to reverse this change at a later date.
NOTE: you may choose to use virtual areas instead of virtual desktops since
GMC does not handle clicks anywhere on the root window on desktops other than
0.
If you want to start enlightenment from gnome-session, you should use the
gnome control-panel to select the new enlightenment as your window manager.
Warning: Enlightenment is slower when run from a session manager. You should
opt to run enlightenment and have enlightenment be your session manager
instead of running gnome-session. You can start "panel" and "gmc" by hand and
have enlightenment relaunch them as the preferred launch method. To do this,
once you have launched them by hand, alt-rightclick on them, select "Remember"
and then choose "Restart Application on Login".
-------------------------------------------------------------------------------
Q: How do I set up Enlightenment to work with KDE?
A: By default, Enlightenment does not support the KDE hints. You can turn them
on easily through your settings menus, however. If you want to add support
automatically upon launch (which can be disabled by the autosaved user
configuration) then copy the control.kde.cfg to the ~/.enlightenment directory
and rename it to control.cfg. If you are doing this after launching
enlightenment for the first time, you will want to remove the line from your
~/.enlightenment/...e_session.XXXXXX file that looks like: <br>
1366 0
simply remove that line and start up enlightenment again.
If your "KDE Support" _settings(settings) panel still show KDE support
turned on, then
you can simply check the box there, and KDE support will remain on.
You can launch kpanel and/or kfm from your .xsession or .xinitrc files and
they will work correctly. If you want to edit the startkde script
(system-wide configuration change) find the line that contains kwm and replace
it with /path/to/enlightenment.
-------------------------------------------------------------------------------

22
INSTALL
View File

@ -248,9 +248,6 @@ with --enable-hints-ewmh (default).
For compatibility with GNOME versions prior to 2.0, configure with
--enable-hints-gnome and read the section about GNOME below.
For compatibility with KDE versions prior to 2.0, configure with
--enable-hints-kde and read the section about KDE below.
Setting Up Enlightenment To Work with GNOME versions prior to 2.0
=================================================================
@ -281,22 +278,3 @@ have enlightenment relaunch them as the preferred launch method. To do this,
once you have launched them by hand, alt-rightclick on them, select "Remember"
and then choose "Restart Application on Login".
Setting Up Enlightenment To Work with KDE versions prior to 2.0
===============================================================
By default, Enlightenment does not support the KDE hints. You can turn them
on easily through your settings menus, however. If you want to add support
automatically upon launch (which can be disabled by the autosaved user
configuration) then copy the control.kde.cfg to the ~/.enlightenment directory
and rename it to control.cfg. If you are doing this after launching
enlightenment for the first time, you will want to remove the line from your
~/.enlightenment/...e_session.XXXXXX file that looks like:
1366 0
simply remove that line and start up enlightenment again.
If your "KDE Support" settings panel still show KDE support turned on, then
you can simply check the box there, and KDE support will remain on.
You can launch kpanel and/or kfm from your .xsession or .xinitrc files and
they will work correctly. If you want to edit the startkde script
(system-wide configuration change) find the line that contains kwm and replace
it with /path/to/enlightenment.

4
configure.in
View File

@ -74,17 +74,13 @@ AC_ARG_ENABLE(hints-ewmh,
[ --enable-hints-ewmh compile with Extended Window Manager Hints support [default=yes]],, enable_hints_ewmh=yes)
AC_ARG_ENABLE(hints-gnome,
[ --enable-hints-gnome compile with GNOME(<2.0) hints support [default=no]],, enable_hints_gnome=no)
AC_ARG_ENABLE(hints-kde,
[ --enable-hints-kde compile with KDE(<2.0) hints support [default=no]],, enable_hints_kde=no)
AC_ARG_WITH(fnlib,
[ --with-fnlib compile with Fnlib support [default=yes]],, with_fnlib=yes)
if test "x$enable_hints_ewmh" = "xyes"; then AC_DEFINE(ENABLE_EWMH, 1, [Extended Window Manager Hints]) fi
if test "x$enable_hints_gnome" = "xyes"; then AC_DEFINE(ENABLE_GNOME, 1, [GNOME(<2.0) Hints]) fi
if test "x$enable_hints_kde" = "xyes"; then AC_DEFINE(ENABLE_KDE, 1, [KDE(<2.0) Hints]) fi
AM_CONDITIONAL(ENABLE_EWMH, test "x$enable_hints_ewmh" = "xyes")
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnome" = "xyes")
AM_CONDITIONAL(ENABLE_KDE, test "x$enable_hints_kde" = "xyes")
dnl The following test must come after AM_GNU_GETTEXT as it relies on
dnl ${DATADIRNAME} being defined.

4
e.spec
View File

@ -36,9 +36,9 @@ This package will install the Enlightenment window manager.
CFLAGS="${RPM_OPT_FLAGS}"
export CFLAGS
if [ ! -f configure ]; then
./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --mandir=%{_mandir} --enable-fsstd --enable-upgrade=no --enable-hints-gnome --enable-hints-kde
./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --mandir=%{_mandir} --enable-fsstd --enable-upgrade=no --enable-hints-gnome
else
%{configure} --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --mandir=%{_mandir} --enable-fsstd --enable-upgrade=no --enable-hints-gnome --enable-hints-kde
%{configure} --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --mandir=%{_mandir} --enable-fsstd --enable-upgrade=no --enable-hints-gnome
fi
make

453
po/de.po
View File

File diff suppressed because it is too large Load Diff

438
po/dk.po
View File

File diff suppressed because it is too large Load Diff

432
po/en_US.po
View File

File diff suppressed because it is too large Load Diff

438
po/es.po
View File

File diff suppressed because it is too large Load Diff

438
po/fr.po
View File

File diff suppressed because it is too large Load Diff

438
po/hu.po
View File

File diff suppressed because it is too large Load Diff

447
po/ja.po
View File

File diff suppressed because it is too large Load Diff

447
po/ko.po
View File

File diff suppressed because it is too large Load Diff

438
po/nl.po
View File

File diff suppressed because it is too large Load Diff

447
po/no.po
View File

File diff suppressed because it is too large Load Diff

447
po/pl.po
View File

File diff suppressed because it is too large Load Diff

438
po/pt.po
View File

File diff suppressed because it is too large Load Diff

439
po/pt_BR.po
View File

File diff suppressed because it is too large Load Diff

438
po/ru.po
View File

File diff suppressed because it is too large Load Diff

447
po/sv.po
View File

File diff suppressed because it is too large Load Diff

447
po/tr.po
View File

File diff suppressed because it is too large Load Diff

53
src/E.h
View File

@ -936,9 +936,6 @@ typedef struct _ewin
Snapshot *snap;
int icon_pmap_w, icon_pmap_h;
Pixmap icon_pmap, icon_mask;
#if ENABLE_KDE
char kde_hint;
#endif
int head;
}
EWin;
@ -1286,14 +1283,6 @@ typedef struct _emode
char nogroup;
GroupConfig group_config;
char group_swapmove;
#if ENABLE_KDE
Window kde_dock;
int kde_support;
int kde_x1;
int kde_x2;
int kde_y1;
int kde_y2;
#endif
char clickalways;
char keybinds_changed;
char firsttime;
@ -1751,31 +1740,6 @@ typedef struct _drawqueue
}
DrawQueue;
#if ENABLE_KDE
/* some kde hint enums here */
typedef enum
{
StickyFlag = (1 << 0),
MaximizedFlag = (1 << 1),
IconifiedFlag = (1 << 2),
AllFlags = 7
}
KStates;
typedef enum
{
AddWindow,
RemoveWindow,
FocusWindow,
RaiseWindow,
LowerWindow,
ChangedClient,
IconChange
}
KMessage;
#endif
/* only used for remember list dialog callback funcs (SettingsDialog()
* in in settings.c)... snaps are attached to windows, not a global list */
typedef struct _remwinlist
@ -2361,22 +2325,6 @@ void GNOME_DelHints(EWin * ewin);
void GNOME_ProcessClientMessage(XClientMessageEvent * event);
#endif
#if ENABLE_KDE
/* kde.c functions */
void KDE_Init(void);
void KDE_Shutdown(void);
void KDE_RemoveModule(Window win);
void KDE_ClientChange(Window win, Atom a);
void KDE_ProcessClientMessage(XClientMessageEvent * event);
void KDE_HintChange(Atom a);
void KDE_SetRootArea(void);
void KDE_UpdateFocusedWindow(void);
void KDE_SetNumDesktops(void);
void KDE_NewWindow(EWin * ewin);
void KDE_RemoveWindow(EWin * ewin);
void KDE_UpdateClient(EWin * ewin);
#endif
#if ENABLE_EWMH
/* ewmh.c functions */
void EWMH_Init(Window win_wm_check);
@ -2942,7 +2890,6 @@ void SettingsPlacement(void);
void SettingsIcons(void);
void SettingsAutoRaise(void);
void SettingsTooltips(void);
void SettingsKDE(void);
void SettingsAudio(void);
void SettingsSpecialFX(void);
void SettingsBackground(Background * bg);

5
src/Makefile.am
View File

@ -1,6 +1,6 @@
SUBDIRS = themes
EXTRA_DIST = README ChangeLog ewmh.c gnome.c kde.c
EXTRA_DIST = README ChangeLog ewmh.c gnome.c
bin_PROGRAMS = enlightenment
@ -10,9 +10,6 @@ endif
if ENABLE_GNOME
SRCS_GNOME = gnome.c
endif
if ENABLE_KDE
SRCS_KDE = kde.c
endif
enlightenment_SOURCES = \
E.h \
timestamp.h \

53
src/actions.c
View File

@ -1471,57 +1471,10 @@ doCleanup(void *params)
}
Efree(blst);
}
#if ENABLE_KDE
if (mode.kde_support)
{
fixed = Erealloc(fixed, sizeof(RectBox) * (k + 2));
ret = Erealloc(ret, sizeof(RectBox) * ((num + j) + 1 + k + 2));
fixed[k].data = NULL;
fixed[k].p = 50;
fixed[k].x = 0;
fixed[k].y = 0;
if (mode.kde_y1 == 0)
{
fixed[k].w = mode.kde_x1;
}
else
{
fixed[k].w = root.w;
}
if (mode.kde_x1 == 0)
{
fixed[k].h = mode.kde_y1;
}
else
{
fixed[k].h = root.h;
}
k++;
fixed[k].data = NULL;
if ((mode.kde_x2 == root.w) && (mode.kde_y2 < root.h))
fixed[k].x = 0;
else
fixed[k].x = mode.kde_x2;
fixed[k].w = mode.kde_x2 - root.w;
if (mode.kde_x2 < root.w)
{
fixed[k].y = 0;
fixed[k].h = root.h;
}
else
{
fixed[k].y = mode.kde_y2;
fixed[k].h = mode.kde_y2 - root.h;
}
fixed[k].p = 50;
k++;
}
#endif
ArrangeRects(fixed, k, floating, j, ret, 0, 0, root.w, root.h, method,
0);
for (i = 0; i < (j + k); i++)
{
if (ret[i].data)
@ -3419,10 +3372,6 @@ doConfigure(void *params)
SettingsAutoRaise();
else if (!strcmp(s, "tooltips"))
SettingsTooltips();
#if ENABLE_KDE
else if (!strcmp(s, "kde"))
SettingsKDE();
#endif
else if (!strcmp(s, "audio"))
SettingsAudio();
else if (!strcmp(s, "fx"))

16
src/arrange.c
View File

@ -927,20 +927,8 @@ ArrangeEwinXY(EWin * ewin, int *px, int *py)
newrect.w = ewin->w;
newrect.h = ewin->h;
newrect.p = ewin->layer;
#if ENABLE_KDE
if (mode.kde_support)
{
ArrangeRects(fixed, j, &newrect, 1, ret,
mode.kde_x1, mode.kde_y1, mode.kde_x2, mode.kde_y2,
ARRANGE_BY_SIZE, 1);
}
else
#endif
{
ArrangeRects(fixed, j, &newrect, 1, ret,
0, 0, root.w, root.h, ARRANGE_BY_SIZE, 1);
}
ArrangeRects(fixed, j, &newrect, 1, ret,
0, 0, root.w, root.h, ARRANGE_BY_SIZE, 1);
for (i = 0; i < j + 1; i++)
{

3
src/borders.c
View File

@ -1511,9 +1511,6 @@ CreateEwin()
ewin->snap = NULL;
ewin->icon_pmap = 0;
ewin->icon_mask = 0;
#if ENABLE_KDE
ewin->kde_hint = 0;
#endif
att.event_mask =
StructureNotifyMask | ResizeRedirectMask | ButtonPressMask |

2
src/conf.h
View File

@ -133,7 +133,7 @@
#define CONTROL_GROUP_STICK 1363
#define CONTROL_GROUP_SHADE 1364
#define CONTROL_GROUP_MIRROR 1365
#define CONTROL_KDESUPPORT 1366
#define CONTROL_KDESUPPORT 1366 /* Obsolete */
#define CONTROL_CLICK_ALWAYS 1367
#define CONTROL_SHOWROOTTOOLTIP 1368
#define CONTROL_PAGER_BUTTONS 1369

8
src/config.c
View File

@ -806,9 +806,8 @@ Config_Control(FILE * ConfigFile)
sscanf(s, "%*s %d %d ", &mode.dockstartx, &mode.dockstarty);
break;
case CONTROL_KDESUPPORT:
#if ENABLE_KDE
/* Taking out the case causes complaints when starting with old config. */
mode.kde_support = i2;
#if 0
/* Ignore */
#endif
break;
case CONTROL_SHOWROOTTOOLTIP:
@ -3895,9 +3894,6 @@ SaveUserControlConfig(FILE * autosavefile)
fprintf(autosavefile, "1364 %i\n", (int)mode.group_config.shade);
fprintf(autosavefile, "1365 %i\n", (int)mode.group_config.mirror);
fprintf(autosavefile, "1372 %i\n", (int)mode.group_swapmove);
#if ENABLE_KDE
fprintf(autosavefile, "1366 %i\n", (int)mode.kde_support);
#endif
fprintf(autosavefile, "1367 %i\n", (int)mode.clickalways);
fprintf(autosavefile, "1368 %i\n", (int)mode.showroottooltip);
fprintf(autosavefile, "1369 %i %i %i\n", (int)mode.pager_sel_button,

40
src/evhandlers.c
View File

@ -999,11 +999,6 @@ HandleDestroy(XEvent * ev)
mode.context_win = win;
#if ENABLE_KDE
if (mode.kde_support)
KDE_RemoveModule(win);
#endif
if (ewin)
{
Pager *p;
@ -1089,6 +1084,7 @@ HandleProperty(XEvent * ev)
Pixmap pm;
GrabX();
pm = ewin->client.icon_pmap;
if (ewin->client.title)
strncpy(title, ewin->client.title, 10240);
@ -1103,20 +1099,14 @@ HandleProperty(XEvent * ev)
ICCCM_GetGeoms(ewin, ev->xproperty.atom);
SessionGetInfo(ewin, ev->xproperty.atom);
SyncBorderToEwin(ewin);
#if ENABLE_KDE
if (mode.kde_support)
KDE_ClientChange(win, ev->xproperty.atom);
#endif
if (ewin->client.title)
if (strncmp(title, ewin->client.title, 10240))
{
UpdateBorderInfo(ewin);
CalcEwinSizes(ewin);
#if ENABLE_KDE
if (mode.kde_support)
KDE_UpdateClient(ewin);
#endif
}
if ((ewin->iconified) && (pm != ewin->client.icon_pmap))
{
Iconbox **ib;
@ -1147,19 +1137,8 @@ HandleProperty(XEvent * ev)
else if (win == root.win)
{
/* we're in the root window, not in a client */
#if ENABLE_KDE
if (mode.kde_support)
{
KDE_HintChange(ev->xproperty.atom);
}
#endif
}
#if ENABLE_KDE
else if (mode.kde_support)
{
KDE_ClientChange(win, ev->xproperty.atom);
}
#endif
EDBUG_RETURN_;
}
@ -1474,17 +1453,8 @@ HandleMapRequest(XEvent * ev)
{
AddToFamily(ev->xmap.window);
HintsSetClientList();
#if ENABLE_KDE
if (mode.kde_support)
{
EWin *ewin;
ewin =
FindItem(NULL, ev->xmap.window, LIST_FINDBY_ID, LIST_TYPE_EWIN);
KDE_NewWindow(ewin);
}
#endif
}
EDBUG_RETURN_;
}

50
src/hints.c
View File

@ -38,9 +38,6 @@ HintsInit(void)
EDBUG(6, "HintsInit");
win = ECreateWindow(root.win, -200, -200, 5, 5, 0);
ICCCM_Init();
#if ENABLE_KDE
/* ??? */
#endif
#if ENABLE_GNOME
GNOME_SetHints(win);
#endif
@ -70,10 +67,6 @@ void
HintsSetDesktopConfig(void)
{
EDBUG(6, "HintsSetDesktopConfig");
#if ENABLE_KDE
if (mode.kde_support)
KDE_SetNumDesktops();
#endif
#if ENABLE_GNOME
GNOME_SetDeskCount();
GNOME_SetDeskNames();
@ -103,10 +96,6 @@ void
HintsSetCurrentDesktop(void)
{
EDBUG(6, "HintsSetCurrentDesktop");
#if ENABLE_KDE
if (mode.kde_support)
KDE_SetRootArea();
#endif
#if ENABLE_GNOME
GNOME_SetCurrentDesk();
#endif
@ -134,10 +123,6 @@ void
HintsSetActiveWindow(EWin * ewin)
{
EDBUG(6, "HintsSetActiveWindow");
#if ENABLE_KDE
if (mode.kde_support)
KDE_UpdateFocusedWindow();
#endif
#if ENABLE_EWMH
EWMH_SetActiveWindow(ewin);
#endif
@ -148,10 +133,6 @@ void
HintsSetWindowDesktop(EWin * ewin)
{
EDBUG(6, "HintsSetWindowDesktop");
#if ENABLE_KDE
if (mode.kde_support)
KDE_UpdateClient(ewin);
#endif
#if ENABLE_GNOME
GNOME_SetEwinDesk(ewin);
#endif
@ -176,10 +157,6 @@ void
HintsSetWindowState(EWin * ewin)
{
EDBUG(6, "HintsSetWindowState");
#if ENABLE_KDE
if (mode.kde_support)
KDE_UpdateClient(ewin);
#endif
#if ENABLE_GNOME
GNOME_SetHint(ewin);
#endif
@ -193,21 +170,9 @@ HintsSetWindowState(EWin * ewin)
void
HintsSetWindowHints(EWin * ewin)
{
#if ENABLE_KDE
int kde_support = 0;
#endif
EDBUG(6, "HintsSetWindowHints");
#if ENABLE_KDE
kde_support = mode.kde_support;
if (mode.kde_support)
KDE_UpdateClient(ewin);
mode.kde_support = 0;
#endif
HintsSetWindowDesktop(ewin);
HintsSetWindowState(ewin);
#if ENABLE_KDE
mode.kde_support = kde_support;
#endif
EDBUG_RETURN_;
}
@ -236,10 +201,6 @@ void
HintsDelWindowHints(EWin * ewin)
{
EDBUG(6, "HintsDelWindowHints");
#if ENABLE_KDE
if (mode.kde_support)
KDE_RemoveWindow(ewin);
#endif
#if ENABLE_GNOME
GNOME_DelHints(ewin);
#endif
@ -260,10 +221,6 @@ HintsProcessPropertyChange(EWin * ewin, Atom atom_change)
#if ENABLE_GNOME
GNOME_GetHints(ewin, atom_change);
#endif
#if ENABLE_KDE
if (mode.kde_support)
KDE_UpdateFocusedWindow();
#endif
#if ENABLE_EWMH
EWMH_ProcessPropertyChange(ewin, atom_change);
#endif
@ -292,13 +249,6 @@ HintsProcessClientMessage(XClientMessageEvent * event)
#if ENABLE_GNOME
else if (!memcmp(name, "_WIN_", 5))
GNOME_ProcessClientMessage(event);
#endif
#if ENABLE_KDE
else if (!memcmp(name, "KWM_", 4))
{
if (mode.kde_support)
KDE_ProcessClientMessage(event);
}
#endif
XFree(name);
EDBUG_RETURN_;

58
src/ipc.c
View File

@ -87,10 +87,6 @@ static void IPC_ListClassMembers(char *params, Client * c);
static void IPC_GeneralInfo(char *params, Client * c);
static void IPC_Modules(char *params, Client * c);
static void IPC_DockConfig(char *params, Client * c);
#if ENABLE_KDE
static void IPC_KDE(char *params, Client * c);
#endif
static void IPC_MemDebug(char *params, Client * c);
static void IPC_Remember(char *params, Client * c);
static void IPC_CurrentTheme(char *params, Client * c);
@ -524,13 +520,6 @@ IPCStruct IPCArray[] = {
" group <groupid> stick <on/off/?>\n"
" group <groupid> shade <on/off/?>\n"
" group <groupid> mirror <on/off/?>\n"},
#if ENABLE_KDE
{
IPC_KDE,
"kde", NULL,
"Turns on and off KDE support",
"use \"kde on\" and \"kde off\" to enable/disable support"},
#endif
{
IPC_MemDebug,
"dump_mem_debug", NULL,
@ -566,7 +555,7 @@ IPCStruct IPCArray[] = {
"open up a config window",
"usage:\n" " configpanel <panelname>\n"
" where panelname is one of the following: focus, moveresize,\n"
" desktops, area, placement, icons, autoraise, tooltips, kde,\n"
" desktops, area, placement, icons, autoraise, tooltips,\n"
" audio, fx, bg, group_defaults, remember"},
{
IPC_RememberList,
@ -604,7 +593,6 @@ IPC_ConfigPanel(char *params, Client * c)
"icons", "icons settings dialog",
"autoraise", "autoraise settings dialog",
"tooltips", "tooltips settings dialog",
"kde", "kde settings dialog",
"audio", "audio settings dialog",
"fx", "special effects settings dialog",
"bg", "background settings dialog",
@ -754,50 +742,6 @@ IPC_Remember(char *params, Client * c)
CommsSend(c, buf);
}
#if ENABLE_KDE
static void
IPC_KDE(char *params, Client * c)
{
char buf[FILEPATH_LEN_MAX];
buf[0] = 0;
if (params)
{
if (!strcmp(params, "on"))
{
if (!mode.kde_support)
KDE_Init();
}
else if (!strcmp(params, "off"))
{
if (mode.kde_support)
KDE_Shutdown();
}
else if (!strcmp(params, "?"))
{
if (mode.kde_support)
{
Esnprintf(buf, sizeof(buf), "kde: active");
}
else
{
Esnprintf(buf, sizeof(buf), "kde: inactive");
}
}
else
{
Esnprintf(buf, sizeof(buf), "Error: unknown state specified");
}
}
else
Esnprintf(buf, sizeof(buf), "Error: no state specified");
if (buf[0])
CommsSend(c, buf);
}
#endif
static void
IPC_Modules(char *params, Client * c)
{

1259
src/kde.c
View File

File diff suppressed because it is too large Load Diff

6
src/main.c
View File

@ -304,12 +304,6 @@ main(int argc, char **argv)
}
HintsSetClientList();
#if ENABLE_KDE
/* start up any kde crap we might need to start up */
if (mode.kde_support)
KDE_Init();
#endif
/* sync just to make sure */
XSync(disp, False);
queue_up = DRAW_QUEUE_ENABLE;

26
src/session.c
View File

@ -188,7 +188,6 @@ GetGenericSMFile(void)
return default_save_prefix();
}
/* This code covers X11R6 and X11R5 clients (xterm, KDE, ...). */
static void
SaveWindowStates(void)
{
@ -581,11 +580,6 @@ doSMExit(void *params)
}
else if (!strcmp(s, "restart_wm"))
{
#if ENABLE_KDE
/* kill off kde */
if (mode.kde_support)
KDE_Shutdown();
#endif
AUDIO_PLAY("SOUND_EXIT");
if (sound_fd >= 0)
close(sound_fd);
@ -631,11 +625,7 @@ doSMExit(void *params)
return;
}
}
#if ENABLE_KDE
/* kill off kde */
if (mode.kde_support)
KDE_Shutdown();
#endif
AUDIO_PLAY("SOUND_EXIT");
EExit(0);
}
@ -1189,11 +1179,6 @@ doSMExit(void *params)
else if (!strcmp(s, "restart_wm"))
{
AUDIO_PLAY("SOUND_WAIT");
#if ENABLE_KDE
/* kill off kde */
if (mode.kde_support)
KDE_Shutdown();
#endif
XCloseDisplay(disp);
disp = NULL;
Esnprintf(s, sizeof(s), "exec %s -display %s", atword(params, 2), dstr);
@ -1275,13 +1260,10 @@ doSMExit(void *params)
execl(DEFAULT_SH_PATH, DEFAULT_SH_PATH, "-c", s, NULL);
}
else if (!strcmp((char *)s, "error"))
EExit(0);
{
EExit(0);
}
#if ENABLE_KDE
/* kill off kde */
if (mode.kde_support)
KDE_Shutdown();
#endif
restarting = False;
SaveSession(1);
AUDIO_PLAY("SOUND_EXIT");

85
src/settings.c
View File

@ -1780,91 +1780,6 @@ SettingsTooltips(void)
ShowDialog(d);
}
#if ENABLE_KDE
static char tmp_kde;
static void CB_ConfigureKDE(int val, void *data);
static void
CB_ConfigureKDE(int val, void *data)
{
if (val < 2)
{
if (tmp_kde != mode.kde_support)
{
mode.kde_support = tmp_kde;
if (mode.kde_support)
KDE_Init();
else if (!mode.kde_support)
KDE_Shutdown();
}
}
autosave();
data = NULL;
}
void
SettingsKDE(void)
{
Dialog *d;
DItem *table, *di;
if ((d = FindItem("CONFIGURE_KDE", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG)))
{
AUDIO_PLAY("SOUND_SETTINGS_ACTIVE");
ShowDialog(d);
return;
}
AUDIO_PLAY("SOUND_SETTINGS_KDE");
tmp_kde = mode.kde_support;
d = CreateDialog("CONFIGURE_KDE");
DialogSetTitle(d, _("KDE Settings"));
table = DialogInitItem(d);
DialogItemTableSetOptions(table, 2, 0, 0, 0);
if (mode.dialog_headers)
{
di = DialogAddItem(table, DITEM_IMAGE);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemImageSetFile(di, "pix/kde.png");
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di, _("Enlightenment KDE\n" "Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
}
di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 2);
DialogItemCheckButtonSetText(di, _("Enable KDE Support"));
DialogItemCheckButtonSetState(di, tmp_kde);
DialogItemCheckButtonSetPtr(di, &tmp_kde);
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
DialogAddButton(d, _("OK"), CB_ConfigureKDE, 1);
DialogAddButton(d, _("Apply"), CB_ConfigureKDE, 0);
DialogAddButton(d, _("Close"), CB_ConfigureKDE, 1);
DialogSetExitFunction(d, CB_ConfigureKDE, 2, d);
DialogBindKey(d, "Escape", CB_SettingsEscape, 0, d);
DialogBindKey(d, "Return", CB_ConfigureKDE, 0, d);
ShowDialog(d);
}
#endif
static char tmp_dialog_headers;
static void CB_ConfigureMiscellaneous(int val, void *data);
static void

7
src/setup.c
View File

@ -447,13 +447,6 @@ SetupX()
mode.manual_placement = 0;
mode.raise_on_next_focus = 1;
mode.raise_after_next_focus = 1;
#if ENABLE_KDE
mode.kde_support = 0;
mode.kde_x1 = 0;
mode.kde_y1 = 0;
mode.kde_x2 = root.w;
mode.kde_y2 = root.h;
#endif
#ifdef WITH_TARTY_WARP
mode.display_warp = 1;
#else

18
src/size.c
View File

@ -94,20 +94,6 @@ MaxSizeHV(EWin * ewin, char *resize_type, int direction)
x2 += x1;
y2 += y1;
#if ENABLE_KDE
if (mode.kde_support)
{
if (x1 < mode.kde_x1)
x1 = mode.kde_x1;
if (x2 > mode.kde_x2)
x2 = mode.kde_x2;
if (y1 < mode.kde_y1)
y1 = mode.kde_y1;
if (y2 > mode.kde_y2)
y2 = mode.kde_y2;
}
#endif
if (type == MAX_ABSOLUTE)
{
/* Simply ignore all windows */
@ -182,10 +168,6 @@ MaxSizeHV(EWin * ewin, char *resize_type, int direction)
ewin->toggle = 1;
exit:;
#if ENABLE_KDE
if (mode.kde_support)
KDE_UpdateClient(ewin);
#endif
}
void

1
src/themes/configs/menus.cfg
View File

@ -97,7 +97,6 @@ ADD_MENU_TEXT_ITEM("Group Settings ...", __A_CONFIG, "group_default
ADD_MENU_TEXT_ITEM("Remember Settings ...", __A_CONFIG, "remember");
ADD_MENU_TEXT_ITEM("Special FX Settings ...", __A_CONFIG, "fx")
ADD_MENU_TEXT_ITEM("Desktop Background Settings ...", __A_CONFIG, "bg")
ADD_MENU_TEXT_ITEM("KDE Support Settings ...", __A_CONFIG, "kde")
ADD_MENU_TEXT_ITEM("Miscellaneous Settings ...", __A_CONFIG, "miscellaneous");
ADD_MENU_TEXT_ITEM("Legacy E-conf tool ...", __A_EXEC, "e-conf")
END_MENU