
2003-10-02 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GtkComponentPeer.java (insets): New field. (initializeInsets): New method. (GtkComponentPeer): Call initializeInsets. Call setCursor and setBounds unconditionally. (setBounds): Convert coordinates if parent is a Window. * gnu/java/awt/peer/gtk/GtkContainerPeer.java (insets): Move field to GtkComponentPeer. (GtkContainerPeer): Don't initialize insets. * gnu/java/awt/peer/gtk/GtkDialogPeer.java (initializeInsets): New method. (create): Call new GtkWindowPeer create method. * gnu/java/awt/peer/gtk/GtkFramePeer.java (initializeInsets): New method. (create): Call new GtkWindowPeer create method. (setBounds): Remove method. (postConfigureEvent): Likewise. * gnu/java/awt/peer/gtk/GtkWindowPeer.java: Replace GTK window type constants with GDK window type constants. (create(int,boolean,int,int,GtkWindowPeer)): New method. (create(int,boolean)): Likewise. (create()): Call create(int,boolean). (nativeSetBounds): New native method declaration. (setBounds): Call native method declaration. (setSize): New native method declaration. (setBoundsCallback): Likewise. (postConfigureEvent): Handle change in insets. Call setSize and setBoundsCallback methods. * java/awt/Window.java (Window): Set visible to false. (setBoundsCallback): New method. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c (gtkWidgetGetLocationOnScreen): If this component is not a container, adjust the location returned based on the peer's allocation. (set(String,boolean)): Revert change from 2003-09-19. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (awt_event_handler): Fix inset calculation. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c: Add JNI glue for Window.setBoundsCallback. * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (create): Set up stacking order, window decorations and window manager hints. (setBoundsCallback): New method. (setSize): New method. (nativeSetBounds): New method. * jni/gtk-peer/gtkpeer.h: Declare setBoundsCallbackID. From-SVN: r72043
146 lines
4.1 KiB
Java
146 lines
4.1 KiB
Java
/* GtkFramePeer.java -- Implements FramePeer with GTK
|
|
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.awt.peer.gtk;
|
|
|
|
import java.awt.Component;
|
|
import java.awt.Frame;
|
|
import java.awt.Graphics;
|
|
import java.awt.Image;
|
|
import java.awt.Insets;
|
|
import java.awt.MenuBar;
|
|
import java.awt.Rectangle;
|
|
import java.awt.event.PaintEvent;
|
|
import java.awt.peer.FramePeer;
|
|
import java.awt.peer.MenuBarPeer;
|
|
|
|
public class GtkFramePeer extends GtkWindowPeer
|
|
implements FramePeer
|
|
{
|
|
int menuBarHeight = 0;
|
|
native int getMenuBarHeight ();
|
|
|
|
native public void setMenuBarPeer (MenuBarPeer bar);
|
|
|
|
public void setMenuBar (MenuBar bar)
|
|
{
|
|
if (bar == null)
|
|
setMenuBarPeer (null);
|
|
else
|
|
setMenuBarPeer ((MenuBarPeer) bar.getPeer ());
|
|
}
|
|
|
|
public GtkFramePeer (Frame frame)
|
|
{
|
|
super (frame);
|
|
}
|
|
|
|
void initializeInsets ()
|
|
{
|
|
// Unfortunately, X does not provide a clean way to calculate the
|
|
// dimensions of a frame's borders before it has been displayed.
|
|
// So we guess and then fix the dimensions upon receipt of the
|
|
// first configure event.
|
|
insets = new Insets (20, 6, 6, 6);
|
|
}
|
|
|
|
void create ()
|
|
{
|
|
// Create a normal decorated window.
|
|
create (GDK_WINDOW_TYPE_HINT_NORMAL, true);
|
|
}
|
|
|
|
public void getArgs (Component component, GtkArgList args)
|
|
{
|
|
super.getArgs (component, args);
|
|
|
|
Frame frame = (Frame) component;
|
|
|
|
args.add ("title", frame.getTitle ());
|
|
args.add ("allow_shrink", frame.isResizable ());
|
|
args.add ("allow_grow", frame.isResizable ());
|
|
}
|
|
|
|
public void setIconImage (Image image)
|
|
{
|
|
/* TODO: Waiting on Toolkit Image routines */
|
|
}
|
|
|
|
public Graphics getGraphics ()
|
|
{
|
|
GdkGraphics g = new GdkGraphics (this);
|
|
g.translateNative (-insets.left, -insets.top);
|
|
return g;
|
|
}
|
|
|
|
// FIXME: When MenuBars work, override postConfigureEvent and
|
|
// setBounds to account for MenuBar dimensions.
|
|
|
|
protected void postMouseEvent(int id, long when, int mods, int x, int y,
|
|
int clickCount, boolean popupTrigger)
|
|
{
|
|
super.postMouseEvent (id, when, mods,
|
|
x + insets.left, y + insets.top,
|
|
clickCount, popupTrigger);
|
|
}
|
|
|
|
protected void postExposeEvent (int x, int y, int width, int height)
|
|
{
|
|
q.postEvent (new PaintEvent (awtComponent, PaintEvent.PAINT,
|
|
new Rectangle (x + insets.left,
|
|
y + insets.top,
|
|
width, height)));
|
|
}
|
|
|
|
public int getState ()
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
public void setState (int state)
|
|
{
|
|
|
|
}
|
|
|
|
public void setMaximizedBounds (Rectangle r)
|
|
{
|
|
|
|
}
|
|
}
|
|
|
|
|