Menu
▾
▴
[Interfacewm-cvs] interfacewm IWMClient.h,1.15,1.16 IWMClient.m,1.24,1.25 IWMIcon.m,1.1,1.2 IWMResizebar.m,1.2,1.3 IWMTitlebar.m,1.10,1.11 IWMWindow.h,1.10,1.11 IWMWindow.m,1.14,1.15 IWMWindowManager+Event.m,1.9,1.10
Update of /cvsroot/interfacewm/interfacewm
In directory sc8-pr-cvs1:/tmp/cvs-serv2260
Modified Files:
IWMClient.h IWMClient.m IWMIcon.m IWMResizebar.m IWMTitlebar.m
IWMWindow.h IWMWindow.m IWMWindowManager+Event.m
Log Message:
change resize/move method names to mimic NSWindow
Index: IWMClient.h
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMClient.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** IWMClient.h 3 Nov 2003 03:52:40 -0000 1.15
--- IWMClient.h 6 Nov 2003 23:28:45 -0000 1.16
***************
*** 82,86 ****
int _clientID;
int _screenNumber;
! NSRect _dimentions;
NSRect _cached_size;
NSRect _outline;
--- 82,86 ----
int _clientID;
int _screenNumber;
! NSRect _frame;
NSRect _cached_size;
NSRect _outline;
***************
*** 101,108 ****
/*!
! * @method initializeDimentions
* @discussion Initializes the client's size and origin
*/
! - initializeDimentions;
/*!
--- 101,108 ----
/*!
! * @method initializeFrame
* @discussion Initializes the client's size and origin
*/
! - initializeFrame;
/*!
***************
*** 168,188 ****
/*!
! * @method moveTo::
! * @discussion Moves client to the provided X/Y coordinates
*/
! - (void)moveTo:(int)xValue :(int)yValue;
/*!
! * @method resizeToWidth:height:
! * @discussion Resizes client to the provided width/height
*/
! - (void)resizeToWidth:(int)width height:(int)height;
/*!
! * @method resizeToWidth:height:x:y:
! * @discussion Resizes client to the provided width/height, and moves client to
! * the provided X/Y coordinates
*/
! - (void)resizeToWidth:(int)width height:(int)height x:(int)xValue y:(int)yValue;
/*!
--- 168,189 ----
/*!
! * @method setFrameTopLeftPoint:
! * @discussion Sets the client's top left point to the provided X/Y coordinates
*/
! - (void)setTopLeftPoint:(NSPoint)aPoint;
/*!
! * @method setSize:
! * @param aSize An NSSize structure
! * @discussion Resizes the client to the provided width/height
*/
! - (void)setSize:(NSSize)aSize;
/*!
! * @method setFrame:display:
! * @discussion Sets the size and origin of the window.
! * @param aRect An NSRect structure
*/
! - (void)setFrame:(NSRect)aRect;
/*!
***************
*** 344,348 ****
- (void)setBorderWidth:(int)aValue;
! - (NSRect)dimentions;
- (int)width;
--- 345,349 ----
- (void)setBorderWidth:(int)aValue;
! - (NSRect)frame;
- (int)width;
Index: IWMClient.m
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMClient.m,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** IWMClient.m 5 Nov 2003 05:19:55 -0000 1.24
--- IWMClient.m 6 Nov 2003 23:28:45 -0000 1.25
***************
*** 64,68 ****
_clientID = XUniqueContext();
_screenNumber = aScreenNumber;
! _dimentions = [window dimentions];
// descriptor
--- 64,68 ----
_clientID = XUniqueContext();
_screenNumber = aScreenNumber;
! _frame = [window frame];
// descriptor
***************
*** 95,99 ****
XWMHints *hints = [window wmHints];
! [self initializeDimentions];
if (hints)
--- 95,99 ----
XWMHints *hints = [window wmHints];
! [self initializeFrame];
if (hints)
***************
*** 118,122 ****
}
! - initializeDimentions
{
int screenNumber = [self screenNumber];
--- 118,122 ----
}
! - initializeFrame
{
int screenNumber = [self screenNumber];
***************
*** 128,167 ****
if (sizeHints->flags & (USSize))
{
! _dimentions.size.width = sizeHints->width;
! _dimentions.size.height = sizeHints->height;
}
// sanity checking for width
! if (_dimentions.size.width < IWM_MINIMUM_SIZE)
! _dimentions.size.width = IWM_MINIMUM_SIZE;
! if (_dimentions.size.width > xMax)
! _dimentions.size.width = xMax;
// sanity checking for height
! if (_dimentions.size.height < IWM_MINIMUM_SIZE)
! _dimentions.size.height = IWM_MINIMUM_SIZE;
! if (_dimentions.size.height > yMax)
! _dimentions.size.height = yMax;
if (sizeHints->flags & (USPosition))
{
! _dimentions.origin.x = sizeHints->x;
! _dimentions.origin.y = sizeHints->y;
// sanity checking for x coordinate
! if (_dimentions.origin.x >= xMax)
! _dimentions.origin.x = xMax-1;
! if (_dimentions.origin.x < 0)
! _dimentions.origin.x = 1;
// sanity checking for y coordinate
! if (_dimentions.origin.y >= yMax)
! _dimentions.origin.y = yMax-1;
! if (_dimentions.origin.y < 0)
! _dimentions.origin.y = 1;
}
else
--- 128,167 ----
if (sizeHints->flags & (USSize))
{
! _frame.size.width = sizeHints->width;
! _frame.size.height = sizeHints->height;
}
// sanity checking for width
! if (_frame.size.width < IWM_MINIMUM_SIZE)
! _frame.size.width = IWM_MINIMUM_SIZE;
! if (_frame.size.width > xMax)
! _frame.size.width = xMax;
// sanity checking for height
! if (_frame.size.height < IWM_MINIMUM_SIZE)
! _frame.size.height = IWM_MINIMUM_SIZE;
! if (_frame.size.height > yMax)
! _frame.size.height = yMax;
if (sizeHints->flags & (USPosition))
{
! _frame.origin.x = sizeHints->x;
! _frame.origin.y = sizeHints->y;
// sanity checking for x coordinate
! if (_frame.origin.x >= xMax)
! _frame.origin.x = xMax-1;
! if (_frame.origin.x < 0)
! _frame.origin.x = 1;
// sanity checking for y coordinate
! if (_frame.origin.y >= yMax)
! _frame.origin.y = yMax-1;
! if (_frame.origin.y < 0)
! _frame.origin.y = 1;
}
else
***************
*** 171,179 ****
position = [GlobalIWM mousePosition];
! _dimentions.origin.x = ((position.x / (float)xMax) *
! (xMax - _dimentions.size.width));
! _dimentions.origin.y = ((position.y / (float)yMax) *
! (yMax - [self titlebarHeight] - _dimentions.size.height));
}
--- 171,179 ----
position = [GlobalIWM mousePosition];
! _frame.origin.x = ((position.x / (float)xMax) *
! (xMax - _frame.size.width));
! _frame.origin.y = ((position.y / (float)yMax) *
! (yMax - [self titlebarHeight] - _frame.size.height));
}
***************
*** 422,427 ****
// initialize the application icon
icon = [[IWMIcon alloc] initForClient:self];
- [icon configure];
- [icon raise];
[self configure];
--- 422,425 ----
***************
*** 524,529 ****
- (void)move
{
[self moveWithMouseUntilButtonRelease];
! [self moveTo:_outline.origin.x :_outline.origin.y];
[self configure];
}
--- 522,532 ----
- (void)move
{
+ NSPoint origin;
+
+ origin.x = _outline.origin.x;
+ origin.y = _outline.origin.y;
+
[self moveWithMouseUntilButtonRelease];
! [self setTopLeftPoint:origin];
[self configure];
}
***************
*** 541,545 ****
}
! // update outline dimentions
_outline.origin.x = [self x];
_outline.origin.y = [self y];
--- 544,548 ----
}
! // update outline frame
_outline.origin.x = [self x];
_outline.origin.y = [self y];
***************
*** 583,587 ****
[self drawOutline];
else
! [self moveTo:_outline.origin.x :_outline.origin.y];
break;
--- 586,590 ----
[self drawOutline];
else
! [self setTopLeftPoint:_outline.origin];
break;
***************
*** 607,612 ****
{
[self resizeWithMouseUntilButtonRelease:resizeWidth];
! [self resizeToWidth:_outline.size.width height:_outline.size.height];
! [self moveTo:_outline.origin.x :_outline.origin.y];
}
--- 610,615 ----
{
[self resizeWithMouseUntilButtonRelease:resizeWidth];
! [self setSize:_outline.size];
! [self setTopLeftPoint:_outline.origin];
}
***************
*** 728,740 ****
if (state.maximized_horz || state.maximized_vert)
{
! int width, height;
! width = (state.maximized_horz ? _cached_size.size.width :
[self width]);
! height = (state.maximized_vert ? _cached_size.size.height :
[self height]);
! [self resizeToWidth:width height:height x:_cached_size.origin.x
! y:_cached_size.origin.y];
state.maximized_horz = NO;
--- 731,744 ----
if (state.maximized_horz || state.maximized_vert)
{
! NSRect frame;
! frame.size.width = (state.maximized_horz ? _cached_size.size.width :
[self width]);
! frame.size.height = (state.maximized_vert ? _cached_size.size.height :
[self height]);
+
+ frame.origin = _cached_size.origin;
! [self setFrame:frame];
state.maximized_horz = NO;
***************
*** 769,775 ****
if (decor.titlebar && state.shaded)
{
! IWMDebug(@"unshading client...", nil);
!
! [parent resizeToWidth:[self width] height:[self height]];
state.shaded = NO;
[self setWMState:NormalState];
--- 773,784 ----
if (decor.titlebar && state.shaded)
{
! NSSize size;
!
! IWMDebug(@"unshading client...", nil);
!
! size.width = [self width];
! size.height = [self height];
!
! [parent setSize:size];
state.shaded = NO;
[self setWMState:NormalState];
***************
*** 833,837 ****
}
! _dimentions.origin.y += aMultiplier * tmp;
}
--- 842,846 ----
}
! _frame.origin.y += aMultiplier * tmp;
}
***************
*** 1074,1080 ****
}
! - (NSRect)dimentions
{
! return _dimentions;
}
--- 1083,1089 ----
}
! - (NSRect)frame
{
! return _frame;
}
***************
*** 1086,1090 ****
- (void)setWidth:(int)value
{
! _dimentions.size.width = value;
}
--- 1095,1099 ----
- (void)setWidth:(int)value
{
! _frame.size.width = value;
}
***************
*** 1097,1101 ****
- (void)setHeight:(int)value
{
! _dimentions.size.height = value;
}
--- 1106,1110 ----
- (void)setHeight:(int)value
{
! _frame.size.height = value;
}
***************
*** 1107,1111 ****
- (void)setX:(int)value
{
! _dimentions.origin.x = value;
}
--- 1116,1120 ----
- (void)setX:(int)value
{
! _frame.origin.x = value;
}
***************
*** 1117,1121 ****
- (void)setY:(int)value
{
! _dimentions.origin.y = value;
}
--- 1126,1130 ----
- (void)setY:(int)value
{
! _frame.origin.y = value;
}
***************
*** 1327,1336 ****
if (!state.maximized_horz)// && decor.maximize_button)
{
_cached_size.size.width = [self width];
! [self resizeToWidth: (iwm_display_width([self screen]) - BORDER_WIDTH)
! height: [self height]
! x: 0
! y: [self y]];
state.maximized_horz = YES;
--- 1336,1349 ----
if (!state.maximized_horz)// && decor.maximize_button)
{
+ NSRect frame;
+
_cached_size.size.width = [self width];
! frame.size.width = iwm_display_width([self screen]) - BORDER_WIDTH;
! frame.size.height = [self height];
! frame.origin.x = 0;
! frame.origin.y = [self y];
!
! [self setFrame:frame];
state.maximized_horz = YES;
***************
*** 1347,1356 ****
if (!state.maximized_vert) // && decor.maximize_button)
{
_cached_size.size.height = [self height];
! [self resizeToWidth: [self width]
! height: (iwm_display_height([self screen]) - BORDER_WIDTH)
! x: [self x]
! y: 0];
state.maximized_vert = YES;
--- 1360,1373 ----
if (!state.maximized_vert) // && decor.maximize_button)
{
+ NSRect frame;
+
_cached_size.size.height = [self height];
! frame.size.width = [self width];
! frame.size.height = iwm_display_height([self screen]) - BORDER_WIDTH;
! frame.origin.x = [self x];
! frame.origin.y = 0;
!
! [self setFrame:frame];
state.maximized_vert = YES;
***************
*** 1393,1402 ****
{
Atom data[1];
!
IWMDebug(@"shading client...", nil);
data[0] = GlobalIWM->atoms.net_wm_state_shaded;
! [parent resizeToWidth:[self width] height:[self titlebarHeight]];
state.shaded = YES;
[self setWMState:IconicState];
--- 1410,1422 ----
{
Atom data[1];
! NSSize size;
!
IWMDebug(@"shading client...", nil);
data[0] = GlobalIWM->atoms.net_wm_state_shaded;
+ size.width = [self width];
+ size.height = [self titlebarHeight];
! [parent setSize:size];
state.shaded = YES;
[self setWMState:IconicState];
***************
*** 1547,1551 ****
}
! - (void)moveTo:(int)xValue :(int)yValue
{
IWMTRACE;
--- 1567,1571 ----
}
! - (void)setTopLeftPoint:(NSPoint)aPoint
{
IWMTRACE;
***************
*** 1553,1557 ****
XGrabServer(GlobalDisplay);
{
! [parent moveTo:xValue :yValue];
[self raise];
[self configure];
--- 1573,1577 ----
XGrabServer(GlobalDisplay);
{
! [parent setTopLeftPoint:aPoint];
[self raise];
[self configure];
***************
*** 1561,1601 ****
}
! - (void)resizeToWidth:(int)width height:(int)height
{
IWMTRACE;
-
XGrabServer(GlobalDisplay);
{
! int windowHeight, adjustment, borderWidth;
!
! adjustment = BORDER_WIDTH * 2;
! borderWidth = [self borderWidth];
! windowHeight = height - [self titlebarHeight] - [self resizebarHeight];
!
! [parent resizeToWidth:width height:height];
! [window resizeToWidth:width height:windowHeight];
!
! [self configure];
}
XUngrabServer(GlobalDisplay);
}
! - (void)resizeToWidth:(int)width height:(int)height x:(int)xValue y:(int)yValue
{
IWMTRACE;
-
XGrabServer(GlobalDisplay);
{
! int windowHeight, adjustment, borderWidth;
!
! adjustment = BORDER_WIDTH * 2;
! borderWidth = [self borderWidth];
! windowHeight = height - [self titlebarHeight] -
! [self resizebarHeight] - adjustment;
!
! [parent resizeToWidth:width height:height];
! [window resizeToWidth:(width - adjustment) height:windowHeight];
! [parent moveTo:xValue :yValue];
! [self configure];
}
XUngrabServer(GlobalDisplay);
--- 1581,1619 ----
}
! - (void)setSize:(NSSize)aSize
{
IWMTRACE;
XGrabServer(GlobalDisplay);
{
! NSSize windowSize;
! windowSize.height = (int)aSize.height - [self titlebarHeight] - [self resizebarHeight];
! windowSize.width = aSize.width;
!
! [parent setSize:aSize];
! [window setSize:windowSize];
!
! [self configure];
}
XUngrabServer(GlobalDisplay);
}
! - (void)setFrame:(NSRect)aRect
{
IWMTRACE;
XGrabServer(GlobalDisplay);
{
! int adjustment = BORDER_WIDTH * 2;
! int windowHeight = (int)aRect.size.height - [self titlebarHeight] -
! [self resizebarHeight] - adjustment;
! NSSize windowSize;
!
! windowSize.width = (int)aRect.size.width - adjustment;
! windwoSize.height = windowHeight;
!
! [parent setSize:aRect.size];
! [window setSize:windowSize];
! [parent setTopLeftPoint:aRect.origin];
!
! [self configure];
}
XUngrabServer(GlobalDisplay);
Index: IWMIcon.m
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMIcon.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IWMIcon.m 28 Oct 2003 04:34:49 -0000 1.1
--- IWMIcon.m 6 Nov 2003 23:28:45 -0000 1.2
***************
*** 50,54 ****
[super configure];
[super unhide];
!
return self;
--- 50,54 ----
[super configure];
[super unhide];
! [super raise];
return self;
Index: IWMResizebar.m
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMResizebar.m,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IWMResizebar.m 28 Oct 2003 02:44:35 -0000 1.2
--- IWMResizebar.m 6 Nov 2003 23:28:45 -0000 1.3
***************
*** 75,87 ****
int height = [client resizebarHeight];
int y = [client height] - height;
// resize
! [self resizeToWidth:([client width] - (GRIP_WIDTH * 2))
! height:height image:[[screen theme] resizebarImage]];
! // place resizebar & grips
! [leftGrip moveTo:0 :y];
! [self moveTo:GRIP_WIDTH :y];
! [rightGrip moveTo:[client width]-GRIP_WIDTH :y];
[leftGrip clear];
--- 75,103 ----
int height = [client resizebarHeight];
int y = [client height] - height;
+ NSSize aSize;
+ NSPoint aPoint;
// resize
! aSize.width = [client width] - (GRIP_WIDTH * 2);
! aSize.height = [client resizebarHeight];
! [self setSize:aSize];
! // set image
! [self setImage:[[screen theme] resizebarImage]];
!
! // place left grip
! aPoint.x = 0;
! aPoint.y = y;
! [leftGrip setTopLeftPoint:aPoint];
!
! // place resizebar
! aPoint.x = GRIP_WIDTH;
! aPoint.y = y;
! [self setTopLeftPoint:aPoint];
!
! // place right grip
! aPoint.x = [client width] - GRIP_WIDTH;
! aPoint.y = y;
! [rightGrip setTopLeftPoint:aPoint];
[leftGrip clear];
Index: IWMTitlebar.m
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMTitlebar.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IWMTitlebar.m 28 Oct 2003 04:34:49 -0000 1.10
--- IWMTitlebar.m 6 Nov 2003 23:28:45 -0000 1.11
***************
*** 143,167 ****
{
NSRect rect;
if ([client focused])
! {
! // if the client is focused, place the focused titlebar image in self
! [self resizeToWidth:[client width]
! height:[self titlebarHeight]
! image:[[[client screen] theme] focusedTitlebarImage]];
! }
else
! {
! // otherwise, place the unfocused titlebar image in self
! [self resizeToWidth:[client width]
! height:[self titlebarHeight]
! image:[[[client screen] theme] unfocusedTitlebarImage]];
! }
!
[self clear];
// if resized, the close button will move
rect = [self closeButtonCoordinates];
! [closeButton moveTo:rect.origin.x :rect.origin.y];
// redraw the name of the client
--- 143,164 ----
{
NSRect rect;
+ NSSize size;
+ IWMImage *image = nil;
+
+ size.width = [client width];
+ size.height = [self titlebarHeight];
if ([client focused])
! image = [[[client screen] theme] focusedTitlebarImage];
else
! image = [[[client screen] theme] unfocusedTitlebarImage];
!
! [self setSize:size];
! [self setImage:image];
[self clear];
// if resized, the close button will move
rect = [self closeButtonCoordinates];
! [closeButton setTopLeftPoint:rect.origin];
// redraw the name of the client
Index: IWMWindow.h
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMWindow.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IWMWindow.h 29 Oct 2003 04:08:03 -0000 1.10
--- IWMWindow.h 6 Nov 2003 23:28:45 -0000 1.11
***************
*** 114,150 ****
/*!
! * @method resizeToWidth:height:
! * @discussion Resizes the window
! * @param aWidth Desired width
! * @param aHeight Desired height
! */
! - (void)resizeToWidth:(int)aWidth height:(int)aHeight;
!
! /*!
! * @method scaleToWidth:height:
! * @discussion Resizes the window & places the image in the background
! * @param aWidth The new width of the window
! * @param aHeight The new height of the window
! * @param image The background image
*/
! - (void)resizeToWidth:(int)aWidth height:(int)aHeight image:(IWMImage *)image;
/*!
! * @method moveTo::
* @discussion Moves a window to an x/y position
- * @param xValue The X coordinate of the destination
- * @param yValue The Y coordinate of the destination
*/
! - (void)moveTo:(int)xValue :(int)yValue;
/*!
! * @method moveTo::::
! * @discussion Resizes and moves a window
! * @param xValue The X coordinate of the destination
! * @param yValue The Y coordinate of the destination
! * @param aWidth The new width of the window
! * @param aHeight The new height of the window
*/
! - (void)moveTo:(int)xValue :(int)yValue :(int)aWidth :(int)aHeight;
/*!
--- 114,135 ----
/*!
! * @method setSize:
! * @param aSize An NSSize structure
! * @discussion Resizes the window to the provided width/height
*/
! - (void)setSize:(NSSize)aSize;
/*!
! * @method setTopLeftPoint:
* @discussion Moves a window to an x/y position
*/
! - (void)setTopLeftPoint:(NSPoint)aPoint;
/*!
! * @method setFrame:display:
! * @discussion Sets the size and origin of the window.
! * @param aRect An NSRect structure
*/
! - (void)setFrame:(NSRect)aRect;
/*!
***************
*** 203,207 ****
- (XWindowAttributes)attributes;
! - (NSRect)dimentions;
- (int)width;
- (int)height;
--- 188,192 ----
- (XWindowAttributes)attributes;
! - (NSRect)frame;
- (int)width;
- (int)height;
Index: IWMWindow.m
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMWindow.m,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** IWMWindow.m 5 Nov 2003 05:19:55 -0000 1.14
--- IWMWindow.m 6 Nov 2003 23:28:45 -0000 1.15
***************
*** 122,129 ****
Window window;
IWMScreen *screen = [GlobalIWM currentScreen];
! NSRect dimentions = [aClient dimentions];
! int xValue = (int)dimentions.origin.x;
! int yValue = (int)dimentions.origin.y;
! int aWidth = (int)dimentions.size.width;
int aHeight = [aClient height];
--- 122,129 ----
Window window;
IWMScreen *screen = [GlobalIWM currentScreen];
! NSRect frame = [aClient frame];
! int xValue = (int)frame.origin.x;
! int yValue = (int)frame.origin.y;
! int aWidth = (int)frame.size.width;
int aHeight = [aClient height];
***************
*** 193,223 ****
*/
! - (void)resizeToWidth:(int)aWidth height:(int)aHeight
! {
! XResizeWindow(GlobalDisplay, xWindow, aWidth, aHeight);
! }
!
! // XXX - this is horrible, unused, horrible, poorly thought out, and horrible
! - (void)resizeToWidth:(int)aWidth height:(int)aHeight image:(IWMImage *)image
{
! // resize the window
! [self resizeToWidth:aWidth height:aHeight];
!
! // scale image to current size of window
! if (image)
! {
! [self setImage:image];
! }
}
! - (void)moveTo:(int)xValue :(int)yValue
{
! XMoveWindow(GlobalDisplay, xWindow, xValue, yValue);
}
! - (void)moveTo:(int)xValue :(int)yValue :(int)aWidth :(int)aHeight
{
! XMoveResizeWindow(GlobalDisplay, xWindow, xValue, yValue, aWidth,
! aHeight);
}
--- 193,210 ----
*/
! - (void)setSize:(NSSize)aSize
{
! XResizeWindow(GlobalDisplay, xWindow, (int)aSize.width, (int)aSize.height);
}
! - (void)setTopLeftPoint:(NSPoint)aPoint
{
! XMoveWindow(GlobalDisplay, xWindow, (int)aPoint.x, (int)aPoint.y);
}
! - (void)setFrame:(NSRect)aRect
{
! XMoveResizeWindow(GlobalDisplay, xWindow, (int)aRect.origin.x, (int)aRect.origin.y,
! (int)aRect.size.width, (int)aRect.size.height);
}
***************
*** 410,414 ****
}
! - (NSRect)dimentions
{
XWindowAttributes attr;
--- 397,401 ----
}
! - (NSRect)frame
{
XWindowAttributes attr;
***************
*** 427,446 ****
- (int)width
{
! return (int)([self dimentions]).size.width;
}
- (int)height
{
! return (int)([self dimentions]).size.height;
}
- (int)x
{
! return (int)([self dimentions]).origin.x;
}
- (int)y
{
! return (int)([self dimentions]).origin.y;
}
--- 414,433 ----
- (int)width
{
! return (int)([self frame]).size.width;
}
- (int)height
{
! return (int)([self frame]).size.height;
}
- (int)x
{
! return (int)([self frame]).origin.x;
}
- (int)y
{
! return (int)([self frame]).origin.y;
}
***************
*** 448,454 ****
{
XConfigureEvent event;
! NSRect dimentions;
! dimentions = [self dimentions];
// create an XEvent to update the window
--- 435,441 ----
{
XConfigureEvent event;
! NSRect frame;
! frame = [self frame];
// create an XEvent to update the window
***************
*** 456,463 ****
event.event = xWindow;
event.window = xWindow;
! event.x = dimentions.origin.x;
! event.y = dimentions.origin.y;
! event.width = dimentions.size.width;
! event.height = dimentions.size.height;
event.border_width = 0;
event.above = None;
--- 443,450 ----
event.event = xWindow;
event.window = xWindow;
! event.x = frame.origin.x;
! event.y = frame.origin.y;
! event.width = frame.size.width;
! event.height = frame.size.height;
event.border_width = 0;
event.above = None;
Index: IWMWindowManager+Event.m
===================================================================
RCS file: /cvsroot/interfacewm/interfacewm/IWMWindowManager+Event.m,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IWMWindowManager+Event.m 5 Nov 2003 05:19:55 -0000 1.9
--- IWMWindowManager+Event.m 6 Nov 2003 23:28:45 -0000 1.10
***************
*** 619,631 ****
else if (event->message_type == atoms.net_moveresize_window)
{
! int gravity, x, y, width, height;
! gravity = event->data.l[0]; // XXX not used right now
! x = event->data.l[1];
! y = event->data.l[2];
! width = event->data.l[3];
! height = event->data.l[4];
! [client resizeToWidth:width height:height x:x y:y];
}
--- 619,633 ----
else if (event->message_type == atoms.net_moveresize_window)
{
! int gravity;
! NSRect frame;
! gravity = event->data.l[0]; // XXX not used right now
!
! frame.origin.x = event->data.l[1];
! frame.origin.y = event->data.l[2];
! frame.size.width = event->data.l[3];
! frame.size.height = event->data.l[4];
! [client setFrame:frame];
}
|