From: copal <co...@us...> - 2004-06-15 05:22:31
|
Update of /cvsroot/interfacewm/interfacewm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31267 Modified Files: IWMScreen.m IWMWindow.h IWMWindow.m IWMWindowManager+Client.m IWMClient.m Log Message: minor cleanup Index: IWMClient.m =================================================================== RCS file: /cvsroot/interfacewm/interfacewm/IWMClient.m,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** IWMClient.m 12 Dec 2003 04:30:07 -0000 1.34 --- IWMClient.m 15 Jun 2004 05:22:21 -0000 1.35 *************** *** 346,354 **** if (mwm_hints->decorations & MWM_DECOR_ALL) { ! decor.border = YES; ! decor.titlebar = YES; ! decor.close_button = YES; decor.minimize_button = YES; ! decor.resizebar = YES; } --- 346,354 ---- if (mwm_hints->decorations & MWM_DECOR_ALL) { ! decor.border = YES; ! decor.titlebar = YES; ! decor.close_button = YES; decor.minimize_button = YES; ! decor.resizebar = YES; } *************** *** 356,364 **** else { ! decor.border = NO; ! decor.titlebar = NO; ! decor.close_button = NO; decor.minimize_button = NO; ! decor.resizebar = NO; // has border --- 356,364 ---- else { ! decor.border = NO; ! decor.titlebar = NO; ! decor.close_button = NO; decor.minimize_button = NO; ! decor.resizebar = NO; // has border *************** *** 463,472 **** height:_outline.size.height x:_outline.origin.x y:_outline.origin.y]; ! // draw coordinates in center of screen coords = [[NSString alloc] initWithFormat:@"Width:%d Height:%d X:%d Y:%d", (int)_outline.size.width, (int)_outline.size.height, (int)_outline.origin.x, (int)_outline.origin.y]; [screen drawCenteredText:coords]; [coords release]; } --- 463,474 ---- height:_outline.size.height x:_outline.origin.x y:_outline.origin.y]; ! // create string describing the client outline coords = [[NSString alloc] initWithFormat:@"Width:%d Height:%d X:%d Y:%d", (int)_outline.size.width, (int)_outline.size.height, (int)_outline.origin.x, (int)_outline.origin.y]; + // draw the coordinates in the center of screen [screen drawCenteredText:coords]; + [coords release]; } *************** *** 543,554 **** - (void)move { ! NSPoint origin; ! ! origin.x = _outline.origin.x; ! origin.y = _outline.origin.y; ! [self moveWithMouseUntilButtonRelease]; ! [self setTopLeftPoint:origin]; ! [self configureNotify]; } --- 545,562 ---- - (void)move { ! // i don't recall why this code is here, and Yen-Ju Chen submitted a ! // patch to remove it (effectively making this simply a call to the ! // -moveMouseUntilButtonRelease method. makes sense, after recalling ! // the movement problems IWM was having, but the codebase is b0rken ! // right now, so i'm just commenting it out until i can compile... ! ! // NSPoint origin; ! // ! // origin.x = _outline.origin.x; ! // origin.y = _outline.origin.y; ! // [self moveWithMouseUntilButtonRelease]; ! // [self setTopLeftPoint:origin]; ! // [self configureNotify]; } *************** *** 745,749 **** // XXX - set _NET_WM_STATE properties ! [window updateWindowState]; } --- 753,757 ---- // XXX - set _NET_WM_STATE properties ! [self update]; } *************** *** 769,773 **** // XXX - set _NET_WM_STATE_MAXIMIZED_HORZ property ! [window updateWindowState]; } } --- 777,781 ---- // XXX - set _NET_WM_STATE_MAXIMIZED_HORZ property ! [self update]; } } *************** *** 793,797 **** // XXX - set _NET_WM_STATE_MAXIMIZED_VERT property ! [window updateWindowState]; } } --- 801,805 ---- // XXX - set _NET_WM_STATE_MAXIMIZED_VERT property ! [self update]; } } *************** *** 818,822 **** // XXX - unset _NET_WM_STATE_MAXIMIZED_{VERT,HORZ} properties ! [window updateWindowState]; } } --- 826,830 ---- // XXX - unset _NET_WM_STATE_MAXIMIZED_{VERT,HORZ} properties ! [self update]; } } *************** *** 843,847 **** // XXX - set _NET_WM_STATE_HIDDEN property ! [window updateWindowState]; } } --- 851,855 ---- // XXX - set _NET_WM_STATE_HIDDEN property ! [self update]; } } *************** *** 863,867 **** // XXX - unset _NET_WM_STATE_HIDDEN property ! [window updateWindowState]; } --- 871,875 ---- // XXX - unset _NET_WM_STATE_HIDDEN property ! [self update]; } *************** *** 886,890 **** // XXX - set _NET_WM_STATE_SHADED property ! [window updateWindowState]; } } --- 894,898 ---- // XXX - set _NET_WM_STATE_SHADED property ! [self update]; } } *************** *** 906,910 **** // XXX - unset _NET_WM_STATE_SHADED property ! [window updateWindowState]; } } --- 914,918 ---- // XXX - unset _NET_WM_STATE_SHADED property ! [self update]; } } *************** *** 926,930 **** [self setWMState:NormalState]; // XXX - change this for EWMH state.focused = YES; ! [window updateWindowState]; [window raise]; --- 934,938 ---- [self setWMState:NormalState]; // XXX - change this for EWMH state.focused = YES; ! [self update]; [window raise]; *************** *** 950,954 **** state.focused = NO; ! [window updateWindowState]; [self redraw]; --- 958,962 ---- state.focused = NO; ! [self update]; [self redraw]; Index: IWMWindow.m =================================================================== RCS file: /cvsroot/interfacewm/interfacewm/IWMWindow.m,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** IWMWindow.m 13 Jun 2004 17:53:07 -0000 1.23 --- IWMWindow.m 15 Jun 2004 05:22:21 -0000 1.24 *************** *** 537,541 **** // set _NET_WM_STATE with updated array ! [self setAtomProperty:GlobalIWM->atoms.net_wm_state format:32 data:(unsigned char *)list elements:i]; } --- 537,541 ---- // set _NET_WM_STATE with updated array ! [self setAtomProperty:GlobalIWM->atoms.net_wm_state data:(unsigned char *)list elements:i]; } *************** *** 655,662 **** } ! - (void)setWindowProperty:(Atom)property format:(int)format data:(unsigned char *)data elements:(int)elements { ! [self setProperty:property type:XA_WINDOW format:format data:data elements:elements]; } --- 655,662 ---- } ! - (void)setWindowProperty:(Atom)property data:(unsigned char *)data elements:(int)elements { ! [self setProperty:property type:XA_WINDOW format:32 data:data elements:elements]; } *************** *** 676,683 **** } ! - (void)setAtomProperty:(Atom)property format:(int)format data:(unsigned char *)data elements:(int)elements { ! [self setProperty:property type:XA_ATOM format:format data:data elements:elements]; } --- 676,683 ---- } ! - (void)setAtomProperty:(Atom)property data:(unsigned char *)data elements:(int)elements { ! [self setProperty:property type:XA_ATOM format:32 data:data elements:elements]; } *************** *** 698,702 **** [self setAtomProperty:GlobalIWM->atoms.iwm_window_type ! format:32 data:(unsigned char *)data elements:1]; } --- 698,702 ---- [self setAtomProperty:GlobalIWM->atoms.iwm_window_type ! data:(unsigned char *)data elements:1]; } Index: IWMWindowManager+Client.m =================================================================== RCS file: /cvsroot/interfacewm/interfacewm/IWMWindowManager+Client.m,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** IWMWindowManager+Client.m 13 Jun 2004 17:53:07 -0000 1.2 --- IWMWindowManager+Client.m 15 Jun 2004 05:22:21 -0000 1.3 *************** *** 81,84 **** --- 81,86 ---- Window list[count]; + // loop over clients in the array, adding each client's + // application window number to the list (EWMH) for (i = 0; i < count; i++) { *************** *** 99,103 **** // XXX - update _NET_CLIENT_LIST [[self rootWindow] setWindowProperty:atoms.net_client_list ! format:32 data:(unsigned char *)list elements:count]; } } --- 101,105 ---- // XXX - update _NET_CLIENT_LIST [[self rootWindow] setWindowProperty:atoms.net_client_list ! data:(unsigned char *)list elements:count]; } } *************** *** 222,226 **** // set _NET_ACTIVE_WINDOW property [[self rootWindow] setWindowProperty:atoms.net_active_window ! format:32 data:(unsigned char *)window elements:1]; } } --- 224,228 ---- // set _NET_ACTIVE_WINDOW property [[self rootWindow] setWindowProperty:atoms.net_active_window ! data:(unsigned char *)window elements:1]; } } *************** *** 230,237 **** --- 232,243 ---- unsigned int count = [clientArray count]; + // only perform a cycle if there is more than one client if (1 < count) { + // unfocus all clients in place [clientArray makeObjectsPerform:@selector(unfocus)]; + // if the head client is the last client in the array, + // change the head client index to 0 if (++_headClientIndex >= count) _headClientIndex = 0; Index: IWMWindow.h =================================================================== RCS file: /cvsroot/interfacewm/interfacewm/IWMWindow.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** IWMWindow.h 13 Jun 2004 17:53:07 -0000 1.17 --- IWMWindow.h 15 Jun 2004 05:22:21 -0000 1.18 *************** *** 208,212 **** data:(unsigned char *)data elements:(int)elements; ! - (void)setWindowProperty:(Atom)property format:(int)format data:(unsigned char *)data elements:(int)elements; --- 208,212 ---- data:(unsigned char *)data elements:(int)elements; ! - (void)setWindowProperty:(Atom)property data:(unsigned char *)data elements:(int)elements; Index: IWMScreen.m =================================================================== RCS file: /cvsroot/interfacewm/interfacewm/IWMScreen.m,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** IWMScreen.m 13 Jun 2004 17:53:06 -0000 1.20 --- IWMScreen.m 15 Jun 2004 05:22:21 -0000 1.21 *************** *** 174,182 **** // set property on root window to id of child window [rootWindow setWindowProperty:GlobalIWM->atoms.net_supporting_wm_check ! format:32 data:(unsigned char *)&tmp elements:1]; // set property on child window to it's own id [_ewmh_window setWindowProperty:GlobalIWM->atoms.net_supporting_wm_check ! format:32 data:(unsigned char *)&tmp elements:1]; /* --- 174,182 ---- // set property on root window to id of child window [rootWindow setWindowProperty:GlobalIWM->atoms.net_supporting_wm_check ! data:(unsigned char *)&tmp elements:1]; // set property on child window to it's own id [_ewmh_window setWindowProperty:GlobalIWM->atoms.net_supporting_wm_check ! data:(unsigned char *)&tmp elements:1]; /* |