summaryrefslogtreecommitdiffstats
path: root/Gui/wm/ws.c
diff options
context:
space:
mode:
Diffstat (limited to 'Gui/wm/ws.c')
-rw-r--r--Gui/wm/ws.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index 0aeb5ea25d..4adcb8efbc 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -18,9 +18,9 @@
#include <inttypes.h>
+#include "../../config.h"
#include "ws.h"
#include "wsconv.h"
-#include "../../config.h"
#include "../../postproc/rgb2rgb.h"
#include <X11/extensions/XShm.h>
@@ -381,9 +381,9 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,uns
{
char buf[32]; int i;
sprintf( buf,"_%s_REMOTE",label );
- for( i=0;i<strlen( buf );i++ )
+ for( i=0;i < (int)strlen( buf );i++ )
if ( ( buf[i] >= 'a' )&&( buf[i] <= 'z' ) ) buf[i]=buf[i] - 32;
- for( i=0;i<strlen( buf );i++ )
+ for( i=0;i < (int)strlen( buf );i++ )
if ( buf[i] == ' ' ) buf[i]='_';
fprintf( stderr,"[ws] atomname: %s\n",buf );
win->AtomRemote=XInternAtom( wsDisplay,buf,False );
@@ -681,11 +681,11 @@ buttonreleased:
wsWindowList[l]->MouseHandler( i,Event->xbutton.x,Event->xbutton.y,Event->xmotion.x_root,Event->xmotion.y_root );
break;
- case GravityNotify:
+// case GravityNotify:
// #ifdef DEBUG
- fprintf( stderr,"[ws] window ( 0x%x ) gravity: %d,%d\n",wsWindowList[l]->WindowID,Event->xgravity.x,Event->xgravity.y );
+// fprintf( stderr,"[ws] window ( 0x%x ) gravity: %d,%d\n",wsWindowList[l]->WindowID,Event->xgravity.x,Event->xgravity.y );
// #endif
- break;
+// break;
case PropertyNotify:
// break;
@@ -730,8 +730,7 @@ buttonreleased:
Bool wsDummyEvents( Display * display,XEvent * Event,XPointer arg )
{ return True; }
-// mplTimerHandler(0); // handle timer event
-void wsHandleEvents(){
+void wsHandleEvents( void ){
// handle pending events
while ( XPending(wsDisplay) ){
XNextEvent( wsDisplay,&wsEvent );
@@ -740,6 +739,8 @@ void wsHandleEvents(){
}
}
+extern void mplTimerHandler( void );
+
void wsMainLoop( void )
{
int delay=20;
@@ -758,7 +759,7 @@ while(wsTrue){
wsEvents( wsDisplay,&wsEvent,NULL );
delay=0;
}
- mplTimerHandler(0); // handle timer event
+ mplTimerHandler(); // handle timer event
usleep(delay*1000); // FIXME!
if(delay<10*20) delay+=20; // pump up delay up to 0.2 sec (low activity)
}