qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

the display's width and height are updated after an XRandR event so we

Browse Source 
don't need to pass down the new values to screen_update_geometry(); so
just read the width/height values directly for both uses of
screen_update_geometry().  prep for further changes in this area.
This commit is contained in:
okan 2012-07-05 17:35:13 +00:00
parent e52aef56f0
commit 43b628a3d0
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/cwm/calmwm.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: calmwm.c,v 1.61 2012/05/16 01:17:14 okan Exp $ * $OpenBSD: calmwm.c,v 1.62 2012/07/05 17:35:13 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -167,8 +167,8 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
xu_ewmh_net_supported_wm_check(sc); xu_ewmh_net_supported_wm_check(sc);
conf_gap(&Conf, sc); conf_gap(&Conf, sc);
screen_update_geometry(sc, DisplayWidth(X_Dpy, sc->which),
DisplayHeight(X_Dpy, sc->which)); screen_update_geometry(sc);
conf_color(&Conf, sc); conf_color(&Conf, sc);

4
app/cwm/calmwm.h
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: calmwm.h,v 1.147 2012/07/03 13:49:03 okan Exp $ * $OpenBSD: calmwm.h,v 1.148 2012/07/05 17:35:13 okan Exp $
*/ */
#ifndef _CALMWM_H_ #ifndef _CALMWM_H_
@ -361,7 +361,7 @@ void search_print_client(struct menu *, int);
XineramaScreenInfo *screen_find_xinerama(struct screen_ctx *, int, int); XineramaScreenInfo *screen_find_xinerama(struct screen_ctx *, int, int);
struct screen_ctx *screen_fromroot(Window); struct screen_ctx *screen_fromroot(Window);
void screen_init_xinerama(struct screen_ctx *); void screen_init_xinerama(struct screen_ctx *);
void screen_update_geometry(struct screen_ctx *, int, int); void screen_update_geometry(struct screen_ctx *);
void screen_updatestackingorder(struct screen_ctx *); void screen_updatestackingorder(struct screen_ctx *);
void kbfunc_client_cycle(struct client_ctx *, union arg *); void kbfunc_client_cycle(struct client_ctx *, union arg *);

8
app/cwm/screen.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: screen.c,v 1.29 2012/07/03 13:49:03 okan Exp $ * $OpenBSD: screen.c,v 1.30 2012/07/05 17:35:13 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -109,10 +109,10 @@ screen_find_xinerama(struct screen_ctx *sc, int x, int y)
} }
void void
screen_update_geometry(struct screen_ctx *sc, int width, int height) screen_update_geometry(struct screen_ctx *sc)
{ {
sc->xmax = width; sc->xmax = DisplayWidth(X_Dpy, sc->which);
sc->ymax = height; sc->ymax = DisplayHeight(X_Dpy, sc->which);
xu_ewmh_net_desktop_geometry(sc); xu_ewmh_net_desktop_geometry(sc);
xu_ewmh_net_workarea(sc); xu_ewmh_net_workarea(sc);

4
app/cwm/xevents.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: xevents.c,v 1.61 2012/07/03 13:49:03 okan Exp $ * $OpenBSD: xevents.c,v 1.62 2012/07/05 17:35:13 okan Exp $
*/ */
/* /*
@ -365,7 +365,7 @@ xev_handle_randr(XEvent *ee)
TAILQ_FOREACH(sc, &Screenq, entry) { TAILQ_FOREACH(sc, &Screenq, entry) {
if (sc->which == (u_int)i) { if (sc->which == (u_int)i) {
XRRUpdateConfiguration(ee); XRRUpdateConfiguration(ee);
screen_update_geometry(sc, rev->width, rev->height); screen_update_geometry(sc);
screen_init_xinerama(sc); screen_init_xinerama(sc);
} }
} }