Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #121259. gtk2 needs to have maximize/minimize WM hints hooked up. Not part of the build.

Browse Source
This commit is contained in:
blizzard%redhat.com 2002-04-30 19:03:12 +00:00
parent 5597a2ea11
commit 5e8334177b
4 changed files with 113 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widget/src/gtk2/nsCommonWidget.cpp
View File

@ -210,6 +210,15 @@ nsCommonWidget::InitScrollbarEvent(nsScrollbarEvent &aEvent, PRUint32 aMsg)
// or not?
}
void
nsCommonWidget::InitSizeModeEvent(nsSizeModeEvent &aEvent)
{
memset(&aEvent, 0, sizeof(nsSizeModeEvent));
aEvent.eventStructType = NS_SIZEMODE_EVENT;
aEvent.message = NS_SIZEMODE;
aEvent.widget = NS_STATIC_CAST(nsIWidget *, this);
}
void
nsCommonWidget::DispatchGotFocusEvent(void)
{

1
widget/src/gtk2/nsCommonWidget.h
View File

@ -76,6 +76,7 @@ public:
GdkEventScroll *aGdkEvent, PRUint32 aMsg);
void InitKeyEvent(nsKeyEvent &aEvent, GdkEventKey *aGdkEvent, PRUint32 aMsg);
void InitScrollbarEvent(nsScrollbarEvent &aEvent, PRUint32 aMsg);
void InitSizeModeEvent(nsSizeModeEvent &aEvent);
void DispatchGotFocusEvent(void);
void DispatchLostFocusEvent(void);

100
widget/src/gtk2/nsWindow.cpp
View File

@ -93,6 +93,8 @@ static gboolean scroll_event_cb (GtkWidget *widget,
GdkEventScroll *event);
static gboolean visibility_notify_event_cb(GtkWidget *widget,
GdkEventVisibility *event);
static gboolean window_state_event_cb (GtkWidget *widget,
GdkEventWindowState *event);
static PRBool gJustGotActivate = PR_FALSE;
nsCOMPtr <nsIRollupListener> gRollupListener;
@ -118,6 +120,7 @@ nsWindow::nsWindow()
mRetryKeyboardGrab = PR_FALSE;
mTransientParent = nsnull;
mWindowType = eWindowType_child;
mSizeState = nsSizeMode_Normal;
}
nsWindow::~nsWindow()
@ -300,6 +303,43 @@ nsWindow::PlaceBehind(nsIWidget *aWidget,
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsWindow::SetSizeMode(PRInt32 aMode)
{
nsresult rv;
LOG(("nsWindow::SetSizeMode [%p] %d\n", (void *)this, aMode));
// Save the requested state.
rv = nsBaseWidget::SetSizeMode(aMode);
// return if there's no shell or our current state is the same as
// the mode we were just set to.
if (!mShell || mSizeState == mSizeMode) {
return rv;
}
switch (aMode) {
case nsSizeMode_Maximized:
gtk_window_maximize(GTK_WINDOW(mShell));
break;
case nsSizeMode_Minimized:
gtk_window_iconify(GTK_WINDOW(mShell));
break;
default:
// nsSizeMode_Normal, really.
if (mSizeState == nsSizeMode_Minimized)
gtk_window_deiconify(GTK_WINDOW(mShell));
else if (mSizeState == nsSizeMode_Maximized)
gtk_window_unmaximize(GTK_WINDOW(mShell));
break;
}
mSizeState = mSizeMode;
return rv;
}
NS_IMETHODIMP
nsWindow::Enable(PRBool aState)
{
@ -1160,6 +1200,45 @@ nsWindow::OnVisibilityNotifyEvent(GtkWidget *aWidget,
}
}
void
nsWindow::OnWindowStateEvent(GtkWidget *aWidget, GdkEventWindowState *aEvent)
{
LOG(("nsWindow::OnWindowStateEvent [%p] changed %d new_window_state %d\n",
(void *)this, aEvent->changed_mask, aEvent->new_window_state));
nsSizeModeEvent event;
InitSizeModeEvent(event);
// did we change to maximized?
if (aEvent->changed_mask & GDK_WINDOW_STATE_MAXIMIZED &&
aEvent->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) {
LOG(("\tMaximized\n"));
event.mSizeMode = nsSizeMode_Maximized;
mSizeState = nsSizeMode_Maximized;
}
// did we change to iconified?
else if (aEvent->changed_mask & GDK_WINDOW_STATE_ICONIFIED &&
aEvent->new_window_state & GDK_WINDOW_STATE_ICONIFIED) {
LOG(("\tMinimized\n"));
event.mSizeMode = nsSizeMode_Minimized;
mSizeState = nsSizeMode_Minimized;
}
// are we now normal?
else if (aEvent->changed_mask == 0 && aEvent->new_window_state == 0) {
LOG(("\tNormal\n"));
event.mSizeMode = nsSizeMode_Normal;
mSizeState = nsSizeMode_Normal;
}
else {
// if we got here it means that it's not an event we want to
// dispatch
return;
}
nsEventStatus status;
DispatchEvent(&event, status);
}
nsresult
nsWindow::NativeCreate(nsIWidget *aParent,
nsNativeWidget aNativeParent,
@ -1219,7 +1298,7 @@ nsWindow::NativeCreate(nsIWidget *aParent,
if (!user_data)
return NS_ERROR_FAILURE;
// XXX support generic containers here for embedding!
// Get the parent moz container
parentMozContainer = MOZ_CONTAINER(user_data);
NS_ASSERTION(parentMozContainer,
"owning widget is not a mozcontainer!\n");
@ -1329,6 +1408,12 @@ nsWindow::NativeCreate(nsIWidget *aParent,
G_CALLBACK(configure_event_cb), NULL);
g_signal_connect(G_OBJECT(mShell), "delete_event",
G_CALLBACK(delete_event_cb), NULL);
// we need to add this to the shell since versions of gtk
// before 2.0.3 forgot to set property_notify events on the
// shell window
gtk_widget_add_events(mShell, GDK_PROPERTY_NOTIFY);
g_signal_connect(G_OBJECT(mShell), "window_state_event",
G_CALLBACK(window_state_event_cb), NULL);
}
if (mContainer) {
@ -2096,6 +2181,19 @@ visibility_notify_event_cb (GtkWidget *widget, GdkEventVisibility *event)
return TRUE;
}
/* static */
gboolean
window_state_event_cb (GtkWidget *widget, GdkEventWindowState *event)
{
nsWindow *window = get_window_for_gtk_widget(widget);
if (!window)
return FALSE;
window->OnWindowStateEvent(widget, event);
return FALSE;
}
// nsChildWindow class
nsChildWindow::nsChildWindow()

4
widget/src/gtk2/nsWindow.h
View File

@ -78,6 +78,7 @@ public:
PRInt32 aY);
NS_IMETHOD PlaceBehind(nsIWidget *aWidget,
PRBool aActivate);
NS_IMETHOD SetSizeMode(PRInt32 aMode);
NS_IMETHOD Enable(PRBool aState);
NS_IMETHOD SetFocus(PRBool aRaise = PR_FALSE);
NS_IMETHOD GetScreenBounds(nsRect &aRect);
@ -158,6 +159,8 @@ public:
GdkEventScroll *aEvent);
void OnVisibilityNotifyEvent(GtkWidget *aWidget,
GdkEventVisibility *aEvent);
void OnWindowStateEvent(GtkWidget *aWidget,
GdkEventWindowState *aEvent);
nsresult NativeCreate(nsIWidget *aParent,
nsNativeWidget aNativeParent,
@ -208,6 +211,7 @@ private:
PRPackedBool mRetryPointerGrab;
PRPackedBool mRetryKeyboardGrab;
GtkWindow *mTransientParent;
PRInt32 mSizeState;
};
class nsChildWindow : public nsWindow {