diff options
Diffstat (limited to 'recordmydesktop')
| -rw-r--r-- | recordmydesktop/src/rmd_get_frame.c | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_poll_events.c | 29 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_rectinsert.c | 8 | 
3 files changed, 19 insertions, 20 deletions
| diff --git a/recordmydesktop/src/rmd_get_frame.c b/recordmydesktop/src/rmd_get_frame.c index 95f3886..fb4d6df 100644 --- a/recordmydesktop/src/rmd_get_frame.c +++ b/recordmydesktop/src/rmd_get_frame.c @@ -366,7 +366,7 @@ void *rmdGetFrame(ProgData *pdata) {  			} else {  				XQueryPointer(	pdata->dpy,  						pdata->specs.root, -						&root_ret,&child_ret, +						&root_ret, &child_ret,  						(int *)&mouse_pos_abs.x,  						(int *)&mouse_pos_abs.y,  						(int *)&mouse_pos_rel.x, diff --git a/recordmydesktop/src/rmd_poll_events.c b/recordmydesktop/src/rmd_poll_events.c index 12ff87e..a53f5bd 100644 --- a/recordmydesktop/src/rmd_poll_events.c +++ b/recordmydesktop/src/rmd_poll_events.c @@ -132,20 +132,20 @@ void rmdInitEventsPolling(ProgData *pdata) {  void rmdEventLoop(ProgData *pdata) { -	int inserts=0; +	int inserts = 0;  	XEvent event;  	while (XPending(pdata->dpy)) {  		XNextEvent(pdata->dpy,&event);  		if (event.type == KeyPress) { -			XKeyEvent *e=(XKeyEvent *)(&event); +			XKeyEvent *e = (XKeyEvent *)(&event);  			if (e->keycode == pdata->pause_key.key) { -				int i=0; -				int found=0; -				for (i=0;i<pdata->pause_key.modnum;i++) { -					if (pdata->pause_key.mask[i]==e->state) { -						found=1; +				int i = 0; +				int found = 0; +				for (i=0; i < pdata->pause_key.modnum; i++) { +					if (pdata->pause_key.mask[i] == e->state) { +						found = 1;  						break;  					}  				} @@ -155,11 +155,11 @@ void rmdEventLoop(ProgData *pdata) {  				}  			}  			if (e->keycode == pdata->stop_key.key) { -				int i=0; -				int found=0; -				for (i=0;i<pdata->stop_key.modnum;i++) { -					if (pdata->stop_key.mask[i]==e->state) { -						found=1; +				int i = 0; +				int found = 0; +				for (i = 0; i < pdata->stop_key.modnum; i++) { +					if (pdata->stop_key.mask[i] == e->state) { +						found = 1;  						break;  					}  				} @@ -170,7 +170,7 @@ void rmdEventLoop(ProgData *pdata) {  			}  		} else if (event.type == Expose) { -			if (event.xexpose.count!=0) +			if (event.xexpose.count != 0)  				continue;  			else if (!pdata->args.noframe) {  				rmdDrawFrame(	pdata->dpy, @@ -178,7 +178,6 @@ void rmdEventLoop(ProgData *pdata) {  						pdata->shaped_w,  						pdata->brwin.rrect.width,  						pdata->brwin.rrect.height); -				  			}  		} else if (!pdata->args.full_shots) { @@ -190,7 +189,7 @@ void rmdEventLoop(ProgData *pdata) {  								event.xcreatewindow.window,  								&attribs)) { -					if (!attribs.override_redirect&& attribs.depth==pdata->specs.depth) +					if (!attribs.override_redirect && attribs.depth == pdata->specs.depth)  						XDamageCreate(	pdata->dpy,  								event.xcreatewindow.window,  								XDamageReportRawRectangles); diff --git a/recordmydesktop/src/rmd_rectinsert.c b/recordmydesktop/src/rmd_rectinsert.c index c9b81b9..a929807 100644 --- a/recordmydesktop/src/rmd_rectinsert.c +++ b/recordmydesktop/src/rmd_rectinsert.c @@ -56,10 +56,10 @@  * \retval -10 Grouping the two rects is possible  *  */ -static int rmdCollideRects(XRectangle *xrect1, -						   XRectangle *xrect2, -						   XRectangle xrect_return[], -						   int *nrects) { +static int rmdCollideRects(	const XRectangle *xrect1, +				const XRectangle *xrect2, +				XRectangle xrect_return[], +				int *nrects) {  	if ((xrect1->x>=xrect2->x)&&  		(xrect1->x+xrect1->width<=xrect2->x+xrect2->width)&&  		(xrect1->y>=xrect2->y)&& | 
