Whoops, forgot to attach the new files. Here they are.
On Sat, 2006-07-15 at 09:56 +0200, Sven de Marothy wrote:
> This implements some of the new 1.5 stuff for AWT.
> - changes to Image (accelerationPriority)
> - always-on-top Window (and GTK peer support)
> - MouseInfo and PointerInfo classes and the necessary
> peers and Toolkit changes.
> - GTK implementation of MouseInfoPeer.
>
> (Note that the getMouseInfoPeer method is not abstract
> in Toolkit and is allowed to throw UnsupportedOpException,
> so I made that the default. Toolkit implementations should
> obviously overload this if possible. That means you, Roman ;))
>
> /Sven
>
> 2006-07-15 Sven de Marothy <[EMAIL PROTECTED]>
>
> * gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java,
> * java/awt/MouseInfo.java,
> * java/awt/PointerInfo.java,
> * java/awt/peer/MouseInfoPeer.java:
> New files.
>
> * java/awt/Image.java
> (accelerationPriority): New field.
> (setAccelerationPriority, getAccelerationPriority): New methods..
>
> * include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h,
> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c,
> * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
> (getMouseCoordinates): New method.
>
> * gnu/java/awt/peer/gtk/GtkFramePeer.java
> (updateAlwaysOnTop): Remove stub overload.
>
> * gnu/java/awt/ClasspathToolkit.java,
> * gnu/java/awt/peer/gtk/GtkToolkit.java,
> * include/gnu_java_awt_peer_gtk_GtkToolkit.h,
> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c:
> (getMouseInfoPeer): New method.
> (getMouseNumberOfButtons): New method.
>
> * gnu/java/awt/peer/gtk/GtkWindowPeer.java
> * include/gnu_java_awt_peer_gtk_GtkWindowPeer.h
> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
> (gtkWindowSetAlwaysOnTop): New method.
> (updateAlwaysOnTop): Implement.
>
> * java/awt/Toolkit.java,
> (getMouseInfoPeer): New method.
>
> * java/awt/Window.java
> (alwaysOnTop): New field.
> (isAlwaysOnTop, setAlwaysOnTop): New methods.
>
> * java/awt/peer/WindowPeer.java: Doc fix.
>
>
--
Sven de Marothy <[EMAIL PROTECTED]>
/* GtkToolkit.java -- Implements an AWT Toolkit using GTK for peers
Copyright (C) 2006
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., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 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.Point;
import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment;
import java.awt.Window;
import java.awt.peer.MouseInfoPeer;
/**
* The MouseInfoPeer is so small, I'm including it here.
*/
public class GtkMouseInfoPeer implements MouseInfoPeer
{
private static GdkGraphicsEnvironment gde = new GdkGraphicsEnvironment();
public int fillPointWithCoords(Point p)
{
int[] coords = gde.getMouseCoordinates();
p.x = coords[1];
p.y = coords[2];
return coords[0];
}
public boolean isWindowUnderMouse(Window w)
{
int[] coords = gde.getMouseCoordinates();
GraphicsDevice[] gds = gde.getScreenDevices();
// Check if the screen of the Window and the cursor match
if( gds[ coords[0] ] != w.getGraphicsConfiguration().getDevice() )
return false;
// Return the bounds-check.
Point p = w.getLocationOnScreen();
return (coords[1] >= p.x && coords[1] < p.x + w.getWidth() &&
coords[2] >= p.y && coords[2] < p.y + w.getHeight() );
}
}
/* MouseInfoPeer.java -- peer interface for MouseInfo
Copyright (C) 2006 Free Software Foundation
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., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 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 java.awt.peer;
import java.awt.Point;
import java.awt.Window;
/**
* MouseInfoPeer is the peer interface java.awt.MouseInfo.
*
* @author Sven de Marothy
* @since 1.5
*/
public interface MouseInfoPeer
{
/**
* Get the mouse pointer coordinates and store them in p (obviously non-null)
* returns the index of the current screen device of the mouse.
*/
public int fillPointWithCoords(Point p);
/**
* Returns whether a given Window is under the mouse.
*/
public boolean isWindowUnderMouse(Window w);
}
/* MouseInfo.java -- utility methods for mice.
Copyright (C) 2006 Free Software Foundation
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., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 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 java.awt;
import gnu.java.awt.ClasspathToolkit;
import java.awt.peer.MouseInfoPeer;
/**
* MouseInfo is a class containing utility functions for mouse information.
*
* @author Sven de Marothy
* @since 1.5
*/
public class MouseInfo
{
private static MouseInfoPeer peer;
/**
* Returns a PointerInfo object containing information about the current
* location of the mouse pointer
*
* @throws HeadlessException if the current GraphicsEnvironment is headless.
* @return a PointerInfo object.
*/
public static PointerInfo getPointerInfo() throws HeadlessException
{
SecurityManager sm = System.getSecurityManager();
if (sm != null)
sm.checkPermission( new AWTPermission("watchMousePointer") );
if( GraphicsEnvironment.isHeadless() )
throw new HeadlessException();
if( peer == null )
peer = Toolkit.getDefaultToolkit().getMouseInfoPeer();
Point p = new Point();
int screen = peer.fillPointWithCoords( p );
GraphicsDevice[] gds = GraphicsEnvironment.getLocalGraphicsEnvironment().
getScreenDevices();
return new PointerInfo( gds[ screen ], p );
}
/**
* Returns the number of mouse buttons, or -1 if no mouse is connected.
* (mentioned in the 1.5 release notes)
*
* @throws HeadlessException if the current GraphicsEnvironment is headless.
* @return an integer number of buttons.
*/
public static int getNumberOfButtons() throws HeadlessException
{
if( GraphicsEnvironment.isHeadless() )
throw new HeadlessException();
return ((ClasspathToolkit)Toolkit.getDefaultToolkit()).
getMouseNumberOfButtons();
}
}
/* PointerInfo.java -- mouse pointer data
Copyright (C) 2006 Free Software Foundation
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., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 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 java.awt;
/**
* PointerInfo represents information about the mouse pointer,
* i.e. its GraphicsDevice and location.
*
* PointerInfo objects cannot be instantiated directly, but are
* retrieved from MouseInfo.getPointerInfo(). PointerInfo objects
* are immutable and will not be updated for future mouse motions.
*
* @since 1.5
* @author Sven de Marothy
*/
public class PointerInfo
{
private GraphicsDevice gd;
private Point p;
/**
* Package-private constructor used by MouseInfo.
*/
PointerInfo( GraphicsDevice gd, Point p )
{
this.gd = gd;
this.p = p;
}
/**
* Returns the GraphicsDevice on which the mouse pointer was located
*
* @return a GraphicsDevice object.
*/
public GraphicsDevice getDevice()
{
return gd;
}
/**
* Returns the coordinates of the mouse pointer.
*
* @return a Point object containing the pointer coordinates.
*/
public Point getLocation()
{
return p;
}
}
