The following shows the diffstat and patchsets between
de95bba..eb2e30a^
----------------------------------------------------------------
commit eb2e30a3de6ad3c38d80eb2cf782227036fefd13
Author: Thomas Adam <tho...@fvwm.org>
Date: Fri Oct 17 18:52:30 2014 +0100
FScreen.c: Few style cleanups
* Reduce spacing between operators;
* Remove unnecessary else blocks by pre-initialising;
* Some reindentation, etc.
---
libs/FScreen.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/libs/FScreen.c b/libs/FScreen.c
index 72059ad..c251dc7 100644
--- a/libs/FScreen.c
+++ b/libs/FScreen.c
@@ -74,7 +74,7 @@ monitor_new(void)
{
struct monitor *m;
- m = calloc(1, sizeof *m);
+ m = mvwm_calloc(1, sizeof *m);
return (m);
}
@@ -162,7 +162,6 @@ void FScreenInit(Display *dpy)
fprintf(stderr, "Falling back to single screen...\n");
}
-
TAILQ_INIT(&monitor_q);
global_monitor = monitor_new();
@@ -246,10 +245,8 @@ init_monitor_contents(struct monitor *m)
m->virtual_scr.prev_desk_and_page_page_x = 0;
m->virtual_scr.prev_desk_and_page_page_y = 0;
- m->virtual_scr.EdgeScrollX =
- DEFAULT_EDGE_SCROLL * m->coord.w / 100;
- m->virtual_scr.EdgeScrollY =
- DEFAULT_EDGE_SCROLL * m->coord.h / 100;
+ m->virtual_scr.EdgeScrollX = DEFAULT_EDGE_SCROLL * m->coord.w / 100;
+ m->virtual_scr.EdgeScrollY = DEFAULT_EDGE_SCROLL * m->coord.h / 100;
}
/* Intended to be called by modules. Simply pass in the parameter from the
@@ -789,12 +786,12 @@ int FScreenGetGeometry(
}
if (1 /*flags & GravityValue*/ && grav != DEFAULT_GRAVITY)
{
- if (hints != NULL && hints->flags & PWinGravity)
+ if (hints != NULL && hints->flags & PWinGravity)
{
hints->win_gravity = grav;
}
}
- if (hints != NULL && ret & XValue && ret & YValue)
+ if (hints != NULL && ret & XValue && ret & YValue)
hints->flags |= USPosition;
return ret;
@@ -812,16 +809,14 @@ int FScreenGetGeometry(
*/
void FScreenMangleScreenIntoUSPosHints(fscreen_scr_t screen, XSizeHints *hints)
{
+ hints->x = 0;
+ hints->y = 0;
+
if (hints->flags & USPosition)
{
hints->x = FSCREEN_MANGLE_USPOS_HINTS_MAGIC;
hints->y = (short)screen;
}
- else
- {
- hints->x = 0;
- hints->y = 0;
- }
return;
}
@@ -838,14 +833,13 @@ void FScreenMangleScreenIntoUSPosHints(fscreen_scr_t
screen, XSizeHints *hints)
*/
int FScreenFetchMangledScreenFromUSPosHints(XSizeHints *hints)
{
- int screen;
+ int screen = 0;
if ((hints->flags & USPosition) &&
hints->x == FSCREEN_MANGLE_USPOS_HINTS_MAGIC)
{
screen = hints->y;
- } else
- screen = 0;
+ }
return screen;
}
----------------------------------------------------------------
Diffstat:
----------------------------------------------------------------
libs/FScreen.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
----------------------------------------------------------------
