diff --git a/ChangeLog b/ChangeLog index 286e8a9..dc74f50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-10-17 Fred Kiefer + + * Headers/win32/WIN32Server.h, + * Source/win32/WIN32Server.m, + * Source/win32/w32_activate.m, + * Source/win32/w32_movesize.m, + * Source/win32/w32_general.m: Removed unused and unneeded code + left over from the last cleanup. This code was mostly setting + server flags that never got read or using falgs that never were set. + 2008-10-14 Fred Kiefer * Source/winlib/WIN32GState.m: Removed unneeded code. General cleanup. diff --git a/Headers/win32/WIN32Server.h b/Headers/win32/WIN32Server.h index a7e55be..6c319c9 100644 --- a/Headers/win32/WIN32Server.h +++ b/Headers/win32/WIN32Server.h @@ -72,24 +72,8 @@ DWORD windowStyleForGSStyle(unsigned int style); typedef struct w32serverFlags { - - int _last_WM_ACTIVATE; - int menuRef; // reference to menu window - unsigned int currentGS_Style; // what style is current event window - BOOL HOLD_MENU_FOR_MOVE; // override GS move event on hide - BOOL HOLD_MENU_FOR_SIZE; // override GS size event on hide BOOL HOLD_MINI_FOR_SIZE; // override GS size event on miniturize - BOOL HOLD_MINI_FOR_MOVE; // override GS move event on miniturize - BOOL HOLD_TRANSIENT_FOR_SIZE; // override GS size event on popup context - BOOL HOLD_TRANSIENT_FOR_MOVE; // override GS move event on popup context - BOOL HAVE_MAIN_MENU; // do we have a main menu? - BOOL HOLD_PAINT_FOR_SIZING; - BOOL _is_menu; // is event window the main menu? BOOL _eventHandled; // did we handle the event? - BOOL _is_cache; // is the event window a cache rep - BOOL _hasGSClassName; // does the event window have a GSclassName - int lastEventType; - int hold; } serverFlags; @interface WIN32Server : GSDisplayServer @@ -104,11 +88,6 @@ typedef struct w32serverFlags { HWND desiredFocus; HWND currentActive; HICON currentAppIcon; - // config window - NSWindow *configWindow; - NSPopUpButton * styleButton; - NSButton * taskbarButton; - NSButton * saveButton; } - (BOOL) handlesWindowDecorations; diff --git a/Source/win32/WIN32Server.m b/Source/win32/WIN32Server.m index cdd1cac..03444e9 100644 --- a/Source/win32/WIN32Server.m +++ b/Source/win32/WIN32Server.m @@ -531,18 +531,7 @@ NSLog(@"Callback"); { flags._eventHandled = NO; - flags._is_menu = NO; - if ((HWND)flags.menuRef == hwnd && flags.HAVE_MAIN_MENU == YES) - flags._is_menu = YES; - // note some cache windows are needed..... just get the zeros - flags._is_cache = [[EVENT_WINDOW(hwnd) className] isEqual: @"GSCacheW"]; - - flags._hasGSClassName = NO; - if ([EVENT_WINDOW(hwnd) className] != nil) - flags._hasGSClassName = YES; - // future house keeping can go here - } - (LRESULT) windowEventProc: (HWND)hwnd : (UINT)uMsg @@ -869,17 +858,11 @@ NSLog(@"Callback"); DWORD wstyle; DWORD estyle; - flags.currentGS_Style = style; - wstyle = [self windowStyleForGSStyle: style]; estyle = [self exwindowStyleForGSStyle: style]; r = GSScreenRectToMS(frame, style, self); - /* - * from here down is reused and unmodified from WIN32EventServer.m - * which has been removed form the subproject - */ NSDebugLLog(@"WTrace", @"window: %@ : %d : %d : %d", NSStringFromRect(frame), type, style, screen); NSDebugLLog(@"WTrace", @" device frame: %d, %d, %d, %d", diff --git a/Source/win32/w32_activate.m b/Source/win32/w32_activate.m index bb350e1..578c0db 100644 --- a/Source/win32/w32_activate.m +++ b/Source/win32/w32_activate.m @@ -34,10 +34,10 @@ - (LRESULT) decodeWM_ACTIVEParams:(WPARAM)wParam : (LPARAM)lParam : (HWND)hwnd { // decode our params - flags._last_WM_ACTIVATE = LOWORD(wParam); + int last_WM_ACTIVATE = LOWORD(wParam); //int minimized = HIWORD(wParam); - switch (flags._last_WM_ACTIVATE) + switch (last_WM_ACTIVATE) { case WA_ACTIVE: //deactivate { @@ -66,48 +66,16 @@ - (LRESULT) decodeWM_ACTIVEAPPParams: (HWND)hwnd : (WPARAM)wParam : (LPARAM)lParam { - BOOL active = [NSApp isActive]; - switch ((int)wParam) { case TRUE: { - if (active==YES) - { - if (flags._is_menu==YES) // have menu and app active - { - // future implimentation if needed - } - else // Not a menu and app is active - { - // window is Visable - if ([EVENT_WINDOW(hwnd) isVisible]==YES) - { - // future implimentation if needed - } - else - { - // future implimentation if needed - } - } - } - else // app is not active - { - [NSApp activateIgnoringOtherApps:YES]; - flags._eventHandled=YES; - } + [NSApp activateIgnoringOtherApps: YES]; + flags._eventHandled = YES; } break; case FALSE: { - if (flags._is_menu==YES) - { - // future implimentation if needed - } - else - { - // future implimentation if needed - } } break; diff --git a/Source/win32/w32_general.m b/Source/win32/w32_general.m index a59308e..c9816d4 100644 --- a/Source/win32/w32_general.m +++ b/Source/win32/w32_general.m @@ -102,7 +102,6 @@ break; case SC_MINIMIZE: flags.HOLD_MINI_FOR_SIZE=TRUE; - flags.HOLD_MINI_FOR_MOVE=TRUE; break; case SC_MONITORPOWER: break; diff --git a/Source/win32/w32_movesize.m b/Source/win32/w32_movesize.m index 5b7585d..cd1f70f 100644 --- a/Source/win32/w32_movesize.m +++ b/Source/win32/w32_movesize.m @@ -53,164 +53,79 @@ data2: rect.origin.y]; - if (hwnd == (HWND)flags.menuRef) - { - //need native code here? - if (flags.HOLD_MENU_FOR_MOVE == FALSE) - { - [EVENT_WINDOW(hwnd) sendEvent: ev]; - } - } - else - { - if (flags.HOLD_TRANSIENT_FOR_MOVE == FALSE) - [EVENT_WINDOW(hwnd) sendEvent: ev]; - } + //need native code here? + [EVENT_WINDOW(hwnd) sendEvent: ev]; - flags.HOLD_MENU_FOR_MOVE=FALSE; - flags.HOLD_MINI_FOR_MOVE=FALSE; - flags.HOLD_TRANSIENT_FOR_MOVE=FALSE; - return 0; } - (LRESULT) decodeWM_SIZEParams:(HWND)hwnd : (WPARAM)wParam : (LPARAM)lParam { - NSPoint eventLocation; - NSRect rect; - RECT r; - NSEvent *ev =nil; - - GetWindowRect(hwnd, &r); - rect = MSScreenRectToGS(r, [EVENT_WINDOW(hwnd) styleMask], self); - eventLocation = rect.origin; - switch ((int)wParam) { case SIZE_MAXHIDE: - { - // stubbed for future development - } - break; + { + // stubbed for future development + } + break; case SIZE_MAXIMIZED: - { - // stubbed for future development - } - break; + { + // stubbed for future development + } + break; case SIZE_MAXSHOW: - { - // stubbed for future development - } - break; + { + // stubbed for future development + } + break; case SIZE_MINIMIZED: - { - if (flags.HOLD_MINI_FOR_SIZE == TRUE) //// this is fix for [5, 25 bug] - break; + { + if (flags.HOLD_MINI_FOR_SIZE == TRUE) // this is fix for [5, 25 bug] + break; - /* FIXME ... RFM 06-Mr-2008.... - * I don't understand the following code sending - * a resize event to the gui when a window is minimised. - * Minimising a GNUstep window does NOT change its size, - * rather it causes it to be hidden and replace by its - * miniwindow counterpart. - * Probably the correct action therefore is to ensure that the - * gui knows the window is miniaturised and do nothing else. - * If we send a resize event telling the gui that its window is - * now tiny, it will most likely mess up most drawing in the - * window. - */ - if (1) - { - [EVENT_WINDOW(hwnd) miniaturize: self]; - break; - } - /* Original unused code follows: */ - - // make event - ev = [NSEvent otherEventWithType: NSAppKitDefined - location: eventLocation - modifierFlags: 0 - timestamp: 0 - windowNumber: (int)hwnd - context: GSCurrentContext() - subtype: GSAppKitWindowResized - data1: rect.size.width - data2: rect.size.height]; - - if (hwnd == (HWND)flags.menuRef) - { - if (flags.HOLD_MENU_FOR_SIZE == FALSE) - { - [[NSApp mainMenu] setMenuChangedMessagesEnabled: YES]; - [EVENT_WINDOW(hwnd) sendEvent: ev]; - [self resizeBackingStoreFor: hwnd]; - [EVENT_WINDOW(hwnd) miniaturize: self]; - [[NSApp mainMenu] setMenuChangedMessagesEnabled: NO]; - } - } - else - { - if (flags.HOLD_TRANSIENT_FOR_SIZE == FALSE) - { - [EVENT_WINDOW(hwnd) sendEvent:ev]; - [self resizeBackingStoreFor: hwnd]; - if ([self usesNativeTaskbar]) - { - [EVENT_WINDOW(hwnd) miniaturize: self]; - } - } - } - } - break; + [EVENT_WINDOW(hwnd) miniaturize: self]; + break; + } + break; case SIZE_RESTORED: - { - // make event - ev = [NSEvent otherEventWithType: NSAppKitDefined - location: eventLocation - modifierFlags: 0 - timestamp: 0 - windowNumber: (int)hwnd - context: GSCurrentContext() - subtype: GSAppKitWindowResized - data1: rect.size.width - data2: rect.size.height]; + { + NSPoint eventLocation; + NSRect rect; + RECT r; + NSEvent *ev =nil; + + GetWindowRect(hwnd, &r); + rect = MSScreenRectToGS(r, [EVENT_WINDOW(hwnd) styleMask], self); + eventLocation = rect.origin; + + // make event + ev = [NSEvent otherEventWithType: NSAppKitDefined + location: eventLocation + modifierFlags: 0 + timestamp: 0 + windowNumber: (int)hwnd + context: GSCurrentContext() + subtype: GSAppKitWindowResized + data1: rect.size.width + data2: rect.size.height]; - if (hwnd == (HWND)flags.menuRef) - { - if (flags.HOLD_MENU_FOR_SIZE == FALSE) - { - [EVENT_WINDOW(hwnd) _setVisible: YES]; - [EVENT_WINDOW(hwnd) sendEvent: ev]; - [self resizeBackingStoreFor: hwnd]; - //[EVENT_WINDOW(hwnd) deminiaturize:self]; - } - } - else - { - if (flags.HOLD_TRANSIENT_FOR_SIZE == FALSE) - { - [EVENT_WINDOW(hwnd) sendEvent: ev]; - [self resizeBackingStoreFor: hwnd]; - // fixes part one of bug [5, 25] see notes - if ([self usesNativeTaskbar]) - [EVENT_WINDOW(hwnd) deminiaturize:self]; - } - } - } - break; + [EVENT_WINDOW(hwnd) sendEvent: ev]; + [self resizeBackingStoreFor: hwnd]; + // fixes part one of bug [5, 25] see notes + if ([self usesNativeTaskbar]) + [EVENT_WINDOW(hwnd) deminiaturize:self]; + } + break; default: - break; + break; } - ev = nil; - flags.HOLD_MENU_FOR_SIZE = FALSE; flags.HOLD_MINI_FOR_SIZE = FALSE; - flags.HOLD_TRANSIENT_FOR_SIZE = FALSE; return 0; }