gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-24 15:12:32 +01:00
Code Issues Projects Releases Wiki Activity

RandR misc.

Browse Source 
This patch is replacing XRandR naming to RandR,
as XRandR is the name of the tool used in X11 and RandR
is the technology WMaker wants to support.
I had to update the info panel too, when many features are
activated not all of them can be displayed properly.
This commit is contained in:
David Maciejak
2014-03-13 23:48:10 +08:00
committed by Carlos R. Mafra
parent afc900a7c3
commit c2e4f62777
7 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WindowMaker.h
View File

@@ -600,7 +600,7 @@ extern struct wmaker_global_variables {
} xkb;
#endif
#ifdef USE_XRANDR
#ifdef USE_RANDR
struct {
Bool supported;
int event_base;

22
src/dialog.c
View File

@@ -1221,7 +1221,7 @@ void wShowInfoPanel(WScreen *scr)
panel->copyrL = WMCreateLabel(panel->win);
WMResizeWidget(panel->copyrL, 360, 60);
WMMoveWidget(panel->copyrL, 15, 185);
WMMoveWidget(panel->copyrL, 15, 190);
WMSetLabelTextAlignment(panel->copyrL, WALeft);
WMSetLabelText(panel->copyrL, COPYRIGHT_TEXT);
font = WMSystemFontOfSize(scr->wmscreen, 11);
@@ -1292,14 +1292,6 @@ void wShowInfoPanel(WScreen *scr)
strbuf = wstrappend(strbuf, _("\nAdditional support for: "));
strbuf = wstrappend(strbuf, "WMSPEC");
#ifdef USE_XRANDR
strbuf = wstrappend(strbuf, ", XRandR ");
if (w_global.xext.randr.supported)
strbuf = wstrappend(strbuf, _("(Supported)"));
else
strbuf = wstrappend(strbuf, _("(Unsupported)"));
#endif
#ifdef MWM_HINTS
strbuf = wstrappend(strbuf, ", MWM");
#endif
@@ -1317,8 +1309,18 @@ void wShowInfoPanel(WScreen *scr)
}
#endif
#ifdef USE_RANDR
strbuf = wstrappend(strbuf, _("\n"));
strbuf = wstrappend(strbuf, "RandR: ");
if (w_global.xext.randr.supported)
strbuf = wstrappend(strbuf, _("supported"));
else
strbuf = wstrappend(strbuf, _("unsupported"));
strbuf = wstrappend(strbuf, ".");
#endif
panel->infoL = WMCreateLabel(panel->win);
WMResizeWidget(panel->infoL, 350, 75);
WMResizeWidget(panel->infoL, 350, 80);
WMMoveWidget(panel->infoL, 15, 115);
WMSetLabelText(panel->infoL, strbuf);
font = WMSystemFontOfSize(scr->wmscreen, 11);

6
src/event.c
View File

@@ -42,7 +42,7 @@
#include "xdnd.h"
#endif
#ifdef USE_XRANDR
#ifdef USE_RANDR
#include <X11/extensions/Xrandr.h>
#endif
@@ -265,7 +265,7 @@ void DispatchEvent(XEvent * event)
break;
case ConfigureNotify:
#ifdef USE_XRANDR
#ifdef USE_RANDR
if (event->xconfigure.window == DefaultRootWindow(dpy))
XRRUpdateConfiguration(event);
#endif
@@ -557,7 +557,7 @@ static void handleExtensions(XEvent * event)
handleXkbIndicatorStateNotify(event);
}
#endif /*KEEP_XKB_LOCK_STATUS */
#ifdef USE_XRANDR
#ifdef USE_RANDR
if (w_global.xext.randr.supported && event->type == (w_global.xext.randr.event_base + RRScreenChangeNotify)) {
/* From xrandr man page: "Clients must call back into Xlib using
* XRRUpdateConfiguration when screen configuration change notify

4
src/screen.c
View File

@@ -31,7 +31,7 @@
#ifdef KEEP_XKB_LOCK_STATUS
#include <X11/XKBlib.h>
#endif /* KEEP_XKB_LOCK_STATUS */
#ifdef USE_XRANDR
#ifdef USE_RANDR
#include <X11/extensions/Xrandr.h>
#endif
@@ -540,7 +540,7 @@ WScreen *wScreenInit(int screen_number)
}
#endif /* KEEP_XKB_LOCK_STATUS */
#ifdef USE_XRANDR
#ifdef USE_RANDR
if (w_global.xext.randr.supported)
XRRSelectInput(dpy, scr->root_win, RRScreenChangeNotifyMask);
#endif

4
src/startup.c
View File

@@ -44,7 +44,7 @@
#ifdef KEEP_XKB_LOCK_STATUS
#include <X11/XKBlib.h>
#endif
#ifdef USE_XRANDR
#ifdef USE_RANDR
#include <X11/extensions/Xrandr.h>
#endif
@@ -592,7 +592,7 @@ void StartUp(Bool defaultScreenOnly)
w_global.xext.shape.supported = XShapeQueryExtension(dpy, &w_global.xext.shape.event_base, &j);
#endif
#ifdef USE_XRANDR
#ifdef USE_RANDR
w_global.xext.randr.supported = XRRQueryExtension(dpy, &w_global.xext.randr.event_base, &j);
#endif