Skip to content

Commit

Permalink
Remove GNOME specific hints
Browse files Browse the repository at this point in the history
These are ancient; use whatever the EWMH specifies.
  • Loading branch information
ThomasAdam committed Aug 6, 2016
1 parent f51d113 commit 4dd867c
Show file tree
Hide file tree
Showing 26 changed files with 3 additions and 1,440 deletions.
1 change: 0 additions & 1 deletion bin/fvwm-config.in
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ while test $# -gt 0; do
--supports-*)
feature=`echo "$1" | sed 's/^--supports-//'`
feature=`echo "$feature" | sed 's/[-_]//g'`
test "$feature" = "gnomewm" && feature="gnomehints"
with=`eval echo '$'with_"$feature"`
test "$with" = "yes" && exit 0
test "$with" = "no" && exit 100
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1627,7 +1627,6 @@ AH_VERBATIM([_ZEND_EXPLICIT_DEFINITIONS],
AC_SUBST(with_bidi)
AC_SUBST(with_gdkimlib)
AC_SUBST(with_gettext)
AC_SUBST(with_gnomelibs)
AC_SUBST(with_iconv)
AC_SUBST(with_perllib)
AC_SUBST(with_png)
Expand Down
14 changes: 0 additions & 14 deletions doc/allCommands.html
Original file line number Diff line number Diff line change
Expand Up @@ -304,20 +304,6 @@ <h1 align="center"> All<img src="images/fvwm.logo.png" alt="fvwm"> &nbsp;&nbsp;C
</tr>
<tr>
<td></td><td></td>
<td></td><td><a href="commands/GnomeButton.html">GnomeButton</a></td>
<td></td><td><a href="commands/Popup.html">Popup</a></td>
<td></td><td></td>
<td></td><td></td>
</tr>
<tr>
<td></td><td></td>
<td></td><td><a href="commands/GnomeShowDesks.html">GnomeShowDesks</a></td>
<td></td><td><a href="commands/Prev.html">Prev</a></td>
<td></td><td></td>
<td></td><td></td>
</tr>
<tr>
<td></td><td></td>
<td></td><td><a href="commands/GotoDesk.html">GotoDesk</a></td>
<td></td><td><a href="commands/PrintInfo.html">PrintInfo</a></td>
<td></td><td></td>
Expand Down
31 changes: 0 additions & 31 deletions doc/commands/GnomeButton.xml

This file was deleted.

1 change: 0 additions & 1 deletion doc/fvwm/bindings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="IgnoreModifiers.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="EdgeCommand.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="EdgeLeaveCommand.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GnomeButton.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Key.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Mouse.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="PointerKey.xml" />
Expand Down
2 changes: 0 additions & 2 deletions doc/groupedCommands.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ <h1 align="center"> Grouped&nbsp;&nbsp; <img src="images/fvwm.logo.png" alt="Fvw
<li><a href="commands/EscapeFunc.html">EscapeFunc</a></li>
<li><a href="commands/FakeClick.html">FakeClick</a></li>
<li><a href="commands/FakeKeypress.html">FakeKeypress</a></li>
<li><a href="commands/GnomeButton.html">GnomeButton</a></li>
<li><a href="commands/IgnoreModifiers.html">IgnoreModifiers</a></li>
<li><a href="commands/Key.html">Key</a></li>
<li><a href="commands/Mouse.html">Mouse</a></li>
Expand Down Expand Up @@ -224,7 +223,6 @@ <h1 align="center"> Grouped&nbsp;&nbsp; <img src="images/fvwm.logo.png" alt="Fvw
<ul>
<li><a href="commands/EwmhBaseStruts.html">EwmhBaseStruts</a></li>
<li><a href="commands/EwmhNumberOfDesktops.html">EwmhNumberOfDesktops</a></li>
<li><a href="commands/GnomeShowDesks.html">GnomeShowDesks</a></li>
</ul>
</td>
<td valign="top">
Expand Down
2 changes: 0 additions & 2 deletions doc/util/cmds.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ Focus
FocusStyle
Function
GlobalOpts
GnomeButton
GnomeShowDesks
GotoDesk
GotoDeskAndPage
GotoPage
Expand Down
4 changes: 2 additions & 2 deletions fvwm/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fvwm_SOURCES = \
commands.h conditional.h condrc.h cursor.h decorations.h events.h \
eventhandler.h eventmask.h ewmh.h ewmh_intern.h expand.h externs.h \
focus.h functable.h functions.h fvwm.h geometry.h focus_policy.h \
gnome.h icccm2.h icons.h menubindings.h menudim.h menugeometry.h \
icccm2.h icons.h menubindings.h menudim.h menugeometry.h \
menuitem.h menuroot.h menuparameters.h menus.h menustyle.h misc.h \
modconf.h module_interface.h module_list.h move_resize.h \
placement.h read.h repeat.h execcontext.h schedule.h screen.h \
Expand All @@ -23,7 +23,7 @@ fvwm_SOURCES = \
menus.c style.c borders.c events.c move_resize.c builtins.c \
add_window.c icons.c fvwm.c frame.c placement.c virtual.c \
menustyle.c conditional.c ewmh.c stack.c session.c colorset.c \
functions.c ewmh_events.c gnome.c geometry.c module_list.c focus.c \
functions.c ewmh_events.c geometry.c module_list.c focus.c \
windowlist.c functable.c menuitem.c expand.c module_interface.c \
menubindings.c decorations.c ewmh_icons.c update.c bindings.c misc.c \
cursor.c colormaps.c modconf.c ewmh_conf.c read.c schedule.c \
Expand Down
21 changes: 0 additions & 21 deletions fvwm/add_window.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
#include "update.h"
#include "style.h"
#include "icons.h"
#include "gnome.h"
#include "ewmh.h"
#include "focus.h"
#include "placement.h"
Expand Down Expand Up @@ -203,13 +202,6 @@ static void CaptureOneWindow(
dpy, FW_W(fw), _XA_WM_DESKTOP, _XA_WM_DESKTOP, 32,
PropModeReplace, (unsigned char *) data, 1);

/* are all these really needed ? */
/* EWMH_SetWMDesktop(fw); */
GNOME_SetHints(fw);
GNOME_SetDesk(fw);
GNOME_SetLayer(fw);
GNOME_SetWinArea(fw);

XSelectInput(dpy, FW_W(fw), NoEventMask);
w = FW_W(fw);
XUnmapWindow(dpy, FW_W_FRAME(fw));
Expand Down Expand Up @@ -2019,12 +2011,6 @@ void setup_style_and_decor(
/****** some numeric values ******/
setup_numeric_vals(fw, pstyle);

/****** GNOME style hints ******/
if (!S_DO_IGNORE_GNOME_HINTS(SCF(*pstyle)))
{
GNOME_GetStyle(fw, pstyle);
}

/* ConfigureNotify motion method */
if (SCR_MOTION_METHOD(&pstyle->flag_mask))
{
Expand Down Expand Up @@ -2672,13 +2658,6 @@ FvwmWindow *AddWindow(
/****** ewmh setup *******/
EWMH_WindowInit(fw);

/****** gnome setup ******/
/* set GNOME hints on the window from flags set on fw */
GNOME_SetHints(fw);
GNOME_SetLayer(fw);
GNOME_SetDesk(fw);
GNOME_SetWinArea(fw);

/****** windowshade ******/
if (state_args.do_shade || SDO_START_SHADED(sflags))
{
Expand Down
2 changes: 0 additions & 2 deletions fvwm/commands.h
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,6 @@ void CMD_Focus(F_CMD_ARGS);
void CMD_FocusStyle(F_CMD_ARGS);
void CMD_Function(F_CMD_ARGS);
void CMD_GlobalOpts(F_CMD_ARGS);
void CMD_GnomeButton(F_CMD_ARGS);
void CMD_GnomeShowDesks(F_CMD_ARGS);
void CMD_GotoDesk(F_CMD_ARGS);
void CMD_GotoDeskAndPage(F_CMD_ARGS);
void CMD_GotoPage(F_CMD_ARGS);
Expand Down
28 changes: 1 addition & 27 deletions fvwm/events.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
#include "add_window.h"
#include "icccm2.h"
#include "icons.h"
#include "gnome.h"
#include "ewmh.h"
#include "update.h"
#include "style.h"
Expand Down Expand Up @@ -1315,7 +1314,6 @@ static inline int _handle_cr_on_client(
/* make sure the window structure has the new position */
update_absolute_geometry(fw);
maximize_adjust_offset(fw);
GNOME_SetWinArea(fw);
}
else if (DO_FORCE_NEXT_CR(fw))
{
Expand Down Expand Up @@ -1734,11 +1732,6 @@ static void __handle_bpress_on_root(const exec_context_t *exc)
exc_destroy_context(exc2);
WaitForButtonsUp(True);
}
else
{
/* do gnome buttonpress forwarding if win == root */
GNOME_ProxyButtonEvent(exc->x.etrigger);
}

return;
}
Expand Down Expand Up @@ -1902,16 +1895,6 @@ void HandleButtonRelease(const evh_args_t *ea)
execute_function(NULL, ea->exc, action, 0);
WaitForButtonsUp(True);
}
else
{
/*
* do gnome buttonpress forwarding if win == root
*/
if (Scr.Root == te->xany.window)
{
GNOME_ProxyButtonEvent(te);
}
}

return;
}
Expand All @@ -1924,12 +1907,7 @@ void HandleClientMessage(const evh_args_t *ea)

DBUG("HandleClientMessage", "Routine Entered");

/* Process GNOME and EWMH Messages */
if (GNOME_ProcessClientMessage(ea->exc))
{
return;
}
else if (EWMH_ProcessClientMessage(ea->exc))
if (EWMH_ProcessClientMessage(ea->exc))
{
return;
}
Expand Down Expand Up @@ -2027,7 +2005,6 @@ void HandleDestroyNotify(const evh_args_t *ea)
ea->exc->x.etrigger->xdestroywindow.window,
ea->exc->x.etrigger->type);
EWMH_WindowDestroyed();
GNOME_SetClientList();

return;
}
Expand Down Expand Up @@ -3321,7 +3298,6 @@ void HandleMapRequestKeepRaised(
}
EWMH_SetClientList();
EWMH_SetClientListStacking();
GNOME_SetClientList();

return;
}
Expand Down Expand Up @@ -3881,7 +3857,6 @@ void HandleShapeNotify(const evh_args_t *ea)
}
frame_setup_shape(
fw, fw->g.frame.width, fw->g.frame.height, sev->shaped);
GNOME_SetWinArea(fw);
EWMH_SetFrameStrut(fw);
if (!IS_ICONIFIED(fw))
{
Expand Down Expand Up @@ -4040,7 +4015,6 @@ void HandleUnmapNotify(const evh_args_t *ea)
}
EWMH_ManageKdeSysTray(te->xunmap.window, te->type);
EWMH_WindowDestroyed();
GNOME_SetClientList();
if (do_map == True)
{
map_event.xmaprequest.window = cw;
Expand Down
1 change: 0 additions & 1 deletion fvwm/frame.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include "focus.h"
#include "borders.h"
#include "frame.h"
#include "gnome.h"
#include "ewmh.h"

/* ---------------------------- local definitions -------------------------- */
Expand Down
6 changes: 0 additions & 6 deletions fvwm/functable.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,6 @@ const func_t func_table[] =
CMD_ENT("globalopts", CMD_GlobalOpts, F_GLOBAL_OPTS, 0, 0),
/* - (obsolete, use corresponding Style * instead) */

CMD_ENT("gnomebutton", CMD_GnomeButton, F_MOUSE, 0, 0),
/* - Pass mouse button presses on root to GNOME program */

CMD_ENT("gnomeshowdesks", CMD_GnomeShowDesks, F_GOTO_DESK, 0, 0),
/* - Limit GNOME pager to the number of desks */

CMD_ENT("gotodesk", CMD_GotoDesk, F_GOTO_DESK, 0, 0),
/* - Switch viewport to another desk same page */

Expand Down
2 changes: 0 additions & 2 deletions fvwm/fvwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
#include "eventhandler.h"
#include "eventmask.h"
#include "icccm2.h"
#include "gnome.h"
#include "ewmh.h"
#include "add_window.h"
#include "libs/fvwmsignal.h"
Expand Down Expand Up @@ -2579,7 +2578,6 @@ int main(int argc, char **argv)
MyXUngrabServer(dpy);
CoerceEnterNotifyOnCurrentWindow();
SessionInit();
GNOME_Init();
DBUG("main", "Entering HandleEvents loop...");

HandleEvents();
Expand Down
1 change: 0 additions & 1 deletion fvwm/fvwm.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ typedef struct
unsigned do_ewmh_use_stacking_hints : 1;
unsigned do_ewmh_ignore_window_type : 1;
unsigned do_iconify_window_groups : 1;
unsigned do_ignore_gnome_hints : 1;
unsigned do_ignore_icon_boxes : 1;
unsigned do_ignore_restack : 1;
unsigned do_use_window_group_hint : 1;
Expand Down

0 comments on commit 4dd867c

Please sign in to comment.