diff options
Diffstat (limited to 'gui/wm')
| -rw-r--r-- | gui/wm/ws.c | 16 | ||||
| -rw-r--r-- | gui/wm/wsxdnd.c | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/gui/wm/ws.c b/gui/wm/ws.c index 65ec992d58..27749be53b 100644 --- a/gui/wm/ws.c +++ b/gui/wm/ws.c @@ -63,7 +63,7 @@ #include <sys/ipc.h> #include <sys/shm.h> -#undef ENABLE_DPMS +#undef ENABLE_DPMS typedef struct { @@ -126,8 +126,8 @@ inline int wsSearch( Window win ); typedef void(*wsTConvFunc)( const unsigned char * in_pixels, unsigned char * out_pixels, unsigned num_pixels ); wsTConvFunc wsConvFunc = NULL; - -void rgb32torgb32( const unsigned char * src, unsigned char * dst,unsigned int src_size ) + +void rgb32torgb32( const unsigned char * src, unsigned char * dst,unsigned int src_size ) { memcpy( dst,src,src_size ); } // --- @@ -166,7 +166,7 @@ void wsWindowDecoration( wsTWindow * win,long d ) if ( wsMotifHints == None ) return; memset( &wsMotifWmHints,0,sizeof( MotifWmHints ) ); - wsMotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; + wsMotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; if ( d ) { wsMotifWmHints.functions=MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE; @@ -218,7 +218,7 @@ if(mDisplay){ /* enable DND atoms */ wsXDNDInitialize(); - + { /* on remote display XShm will be disabled - LGB */ char *dispname=DisplayString(wsDisplay); int localdisp=1; @@ -808,7 +808,7 @@ void wsFullScreen( wsTWindow * win ) #ifdef ENABLE_DPMS wsScreenSaverOff( wsDisplay ); #endif - + vo_x11_ewmh_fullscreen( _NET_WM_STATE_ADD ); // adds fullscreen state if wm supports EWMH } @@ -1290,7 +1290,7 @@ void wsSetIcon( Display * dsp,Window win,Pixmap icon,Pixmap mask ) XWMHints * wm; long data[2]; Atom iconatom; - + wm=XGetWMHints( dsp,win ); if ( !wm ) wm=XAllocWMHints(); @@ -1304,7 +1304,7 @@ void wsSetIcon( Display * dsp,Window win,Pixmap icon,Pixmap mask ) data[1]=mask; iconatom=XInternAtom( dsp,"KWM_WIN_ICON",0 ); XChangeProperty( dsp,win,iconatom,iconatom,32,PropModeReplace,(unsigned char *)data,2 ); - + XFree( wm ); } diff --git a/gui/wm/wsxdnd.c b/gui/wm/wsxdnd.c index ba2236f868..d06e295b60 100644 --- a/gui/wm/wsxdnd.c +++ b/gui/wm/wsxdnd.c @@ -138,7 +138,7 @@ wsXDNDProcessSelection(wsTWindow* wnd, XEvent *event) if (num >= MAX_DND_FILES) break; } - + /* Handle the files */ if(wnd->DandDHandler){ wnd->DandDHandler(num,files); @@ -187,7 +187,7 @@ wsXDNDProcessClientMessage(wsTWindow* wnd, XClientMessageEvent *event) offset,256,False,XA_ATOM,&ret_type, &ret_format,&ret_items,&ret_left, (unsigned char**)&ret_buff); - + /* sanity checks...*/ if(ret_buff == NULL || ret_type != XA_ATOM || ret_format != 8*sizeof(Atom)){ XFree(ret_buff); @@ -210,11 +210,11 @@ wsXDNDProcessClientMessage(wsTWindow* wnd, XClientMessageEvent *event) } return True; } - + if (event->message_type == XA_XdndLeave) { return True; } - + if (event->message_type == XA_XdndDrop) { if (event->data.l[0] != XGetSelectionOwner(wsDisplay, XA_XdndSelection)){ puts("Wierd selection owner... QT?"); @@ -226,7 +226,7 @@ wsXDNDProcessClientMessage(wsTWindow* wnd, XClientMessageEvent *event) } return True; } - + if (event->message_type == XA_XdndPosition) { Window srcwin = event->data.l[0]; if (atom_support == None){ @@ -241,19 +241,19 @@ wsXDNDProcessClientMessage(wsTWindow* wnd, XClientMessageEvent *event) xevent.xany.display = wsDisplay; xevent.xclient.window = srcwin; xevent.xclient.message_type = XA_XdndStatus; - xevent.xclient.format = 32; - + xevent.xclient.format = 32; + XDND_STATUS_TARGET_WIN (&xevent) = event->window; XDND_STATUS_WILL_ACCEPT_SET (&xevent, True); XDND_STATUS_WANT_POSITION_SET(&xevent, True); /* actually need smth real here */ XDND_STATUS_RECT_SET(&xevent, 0, 0, 1024,768); XDND_STATUS_ACTION(&xevent) = XA_XdndActionCopy; - + XSendEvent(wsDisplay, srcwin, 0, 0, &xevent); } return True; } - + return False; } |