Skip to content

Commit

Permalink
HAVE_XRANDR: remove macro as randr is mandatory
Browse files Browse the repository at this point in the history
Because support in X11 Xorg is prevalent for the RandR protocol, fvwm3
has mandated for some time that RandR is a required dependency, and not
optional.

Thus, remove surrounding guards for '#ifdef HAVE_XRANDR' as they're no
longer needed.
  • Loading branch information
ThomasAdam committed Jan 20, 2021
1 parent f1f7c4e commit d20e90a
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 16 deletions.
4 changes: 0 additions & 4 deletions fvwm/events.c
Original file line number Diff line number Diff line change
Expand Up @@ -1765,7 +1765,6 @@ static void __refocus_stolen_focus_win(const evh_args_t *ea)

/* ---------------------------- event handlers ----------------------------- */

#ifdef HAVE_XRANDR
void monitor_update_ewmh(void)
{
FvwmWindow *t;
Expand Down Expand Up @@ -1831,7 +1830,6 @@ monitor_emit_broadcast(void)
}
}
}
#endif

void HandleButtonPress(const evh_args_t *ea)
{
Expand Down Expand Up @@ -4078,7 +4076,6 @@ void dispatch_event(XEvent *e)

XFlush(dpy);

#if HAVE_XRANDR
XRRScreenChangeNotifyEvent *sce;

switch (e->type - randr_event) {
Expand All @@ -4091,7 +4088,6 @@ void dispatch_event(XEvent *e)
break;
}
}
#endif

if (w == Scr.Root)
{
Expand Down
2 changes: 0 additions & 2 deletions fvwm/fvwm3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1305,9 +1305,7 @@ static void setVersionInfo(void)
#ifdef HAVE_BIDI
strcat(support_str, " Bidi text,");
#endif
#ifdef HAVE_XRANDR
strcat(support_str, " XRandR,");
#endif
#ifdef HAVE_XRENDER
strcat(support_str, " XRender,");
#endif
Expand Down
6 changes: 0 additions & 6 deletions libs/FScreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@
#include "FScreen.h"
#include "FEvent.h"

#ifdef HAVE_XRANDR
# define IS_RANDR_ENABLED 1
#else
# define IS_RANDR_ENABLED 0
#endif

#define GLOBAL_SCREEN_NAME "_global"

/* In fact, only corners matter -- there will never be GRAV_NONE */
Expand Down
5 changes: 1 addition & 4 deletions libs/fvwm_x11.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <X11/cursorfont.h>
#include <X11/Xproto.h>
#include <X11/Intrinsic.h>
#include <X11/extensions/Xrandr.h>

#ifdef XPM
#define XpmSupport 1
Expand Down Expand Up @@ -46,10 +47,6 @@ typedef Picture XRenderPicture;
#include <fontconfig/fontconfig.h>
#endif

#ifdef HAVE_XRANDR
#include <X11/extensions/Xrandr.h>
#endif

#ifdef SHAPE
#include <X11/extensions/shape.h>
#endif
Expand Down

0 comments on commit d20e90a

Please sign in to comment.