777e6d799a
* gnu/gcj/awt/ComponentDataBlitOp.java: New file. * gnu/gcj/awt/GLightweightPeer.java: New file. * java/awt/BorderLayout.java: Implemented all methods. * java/awt/Button.java (actionListener, actionCommand): Renamed and modifier change. (addNotify): Call super. (dispatchEventImpl): New method. (getListeners): New method. (label): Made package-private, not private. * java/awt/Canvas.java: Implemented class body. * java/awt/Color.java (brighter): New method. (darker): New method. (hashCode): New method. * java/awt/Component.java (visible, enabled, eventMask): Set defaults. (getGraphicsConfiguration): Delegate to getGraphicsConfigurationImpl(). (getGraphicsConfigurationImpl): New method. (getToolkit): Only return value from peer if not null. (isDisplayable): Check with parent. (isShowing): No parent implies not showing. (getForeground): Check parent property if local is null. (getBackground): Likewise. (getFont): Likewise. (setForeground): Inform peer. (setBackground): Likewise (setLocale): Invalidate component. (getColorModel): Implemented. (setLocation): Invalidate, or ignore if no change. (setSize): Invalidate, or ignore if no change. (setBounds): Invalidate, or ignore if no change. (isOpaque): By default, heavyweight implies opaque. (isLightweight): Implemented. (getMaximumSize): Implemented. (doLayout): Implemented, NOP. (validate): Implemented, NOP. (invalidate): Only propagate to parent if parent was valid. (getGraphics): Implemented. (getFontMetrics): Implemented. (update): Implemented. (paintAll): Implemented. (repaint): Implemented all repaint methods. (print): Implemented. (printAll): Implemented. (createImage): Implemented. (dispatchEvent): Give the peer a chance to handle the event. (dispatchEventImpl): Dispatch paint events. (enableEvents): Lightweights enable events on parent component. (coalesceEvents): Coalesce paint events, and select event type using a switch. (coalescePaintEvents): New method. (processEvent): Fix unfortunate ordering of statements, and call correct method for MOUSE_CLICKED. (processPaintEvent): New method. (addNotify): Allow container to notify children before event mask is set in peer. (addNotifyContainerChildren): New method. (removeNotify): Visibility should not change on removeNotify. (paramString): Implemented. (list): Implemented two of the list methods. * Container (myInsets): Removed, insets are managed by peer. (getInsets): Query peer. (addImpl): Fix reparenting, enable events for lightweights, initialize component array. (validate): Call doLayout in validateTree() instead. (validateTree): Do nothing if already valid. Call beginValidate(), endValidate() on peer. Call validateTree() instead of validate() for children that are containers. Mark valid after validation of children. (setFont): Partial implementation. (paint): Implemented. (visitChildren): New method. (visitChild): New method. (update): Implemented. (print): Implemented. (paintComponents): Implemented. (printComponents): Consider translation and clipping. (getComponentAt): Ignore invisible children. Return this if no child match. (addNotify): Call super. (addNotifyContainerChildren): New method. (paramString): Implemented. (list): Implemented. * java/awt/EventQueue (invokeAndWait): Get system event queue the right way. (invokeLater): Likewise. (isDispatchThread): Likewise. * java/awt/FontMetrics (getLeading): Formula change. (getDescent): Consider leading also. (getMaxAscent): Default to getAscent(). (getMaxDescent): Default to getDescent. (getMaxAdvance): Return value signifying unknown. (charWidth): Both methods implemented. (charsWidth): Implemented. (bytesWidth): Implemented. (getWidths): Implemented. * java/awt/Frame.java (NORMAL, ICONIFIED, iconImage, isResizable, state): New fields. (Frame): Rearragend constuctor chaining to disallow null being passed as a graphics configuration. (getTitle): Return empty string if null. (dispose): Removed. (getIconImage): New method. (setIconImage): New method. (finalize): New method. (setMenuBar): Notify peer. (isResizable): New method. (setResizable): New method. (getState): New method. (getFont): Removed. (remove): Implemented. (removeNotify): New method. (getFrames): New method. * java/awt/Graphics.java: Implemented body of class. * java/awt/Graphics2D.java: New file. * java/awt/GraphicsConfiguration.java: Enabled part of the API. * java/awt/Image.java: Implemented body of class. * java/awt/Panel.java (Panel): Call correct super constructor. (addNotify): Implemented. * java/awt/Rectangle.java (isEmpty): Fixed reversed logic. * java/awt/RenderingHints.java: New file. * java/awt/Toolkit.java (createComponent): Implemented. (getSystemEventQueue): Delegate to getSystemEventQueueImpl(). * java/awt/Window.java (Window): Two new constructors. Reordered constructor chaining. (getGraphicsConfigurationImpl): New method. (finalize): Call super. (addNotify): Call super. (pack): Do layout stuff. (show): Ensure that peer exists and that component is valid. (dispose): Dispose owned children. (getOwner): Simplify code, casting null pointers is valid. (getGraphicsConfiguration): Ask peer if local value is null. * java/awt/event/ActionEvent.java (getActionCommand): Renamed from getcmd(). * java/awt/image/BufferedImage.java: New file. * java/awt/image/RasterOp.java: New file. * java/awt/peer/ComponentPeer.java (getGraphicsConfiguration): More powerfull replacement for getColorModel(). (getColorModel) Removed. (setEventMask) New method. * Makefile.am: Added new files. * Makefile.in: Rebuilt. From-SVN: r35748
256 lines
6.2 KiB
Java
256 lines
6.2 KiB
Java
/* Copyright (C) 2000 Free Software Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
package java.awt;
|
|
|
|
import java.awt.event.*;
|
|
import java.util.EmptyStackException;
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
/* Written using on-line Java 2 Platform Standard Edition v1.3 API
|
|
* Specification, as well as "The Java Class Libraries", 2nd edition
|
|
* (Addison-Wesley, 1998).
|
|
* Status: Believed complete, but untested. Check FIXME's.
|
|
*/
|
|
|
|
/** @author Bryce McKinlay */
|
|
|
|
public class EventQueue
|
|
{
|
|
private static final int INITIAL_QUEUE_DEPTH = 8;
|
|
private AWTEvent[] queue = new AWTEvent[INITIAL_QUEUE_DEPTH];
|
|
|
|
private int next_in = 0; // Index where next event will be added to queue
|
|
private int next_out = 0; // Index of next event to be removed from queue
|
|
|
|
private EventQueue next;
|
|
private EventQueue prev;
|
|
|
|
private EventDispatchThread dispatchThread = new EventDispatchThread(this);
|
|
|
|
public EventQueue()
|
|
{
|
|
}
|
|
|
|
public synchronized AWTEvent getNextEvent()
|
|
throws InterruptedException
|
|
{
|
|
if (next != null)
|
|
return next.getNextEvent();
|
|
|
|
while (next_in == next_out)
|
|
wait();
|
|
|
|
AWTEvent res = queue[next_out];
|
|
|
|
if (++next_out == queue.length)
|
|
next_out = 0;
|
|
return res;
|
|
}
|
|
|
|
/** @specnote Does not block. Returns null if there are no events on the
|
|
* queue.
|
|
*/
|
|
public synchronized AWTEvent peekEvent()
|
|
{
|
|
if (next != null)
|
|
return next.peekEvent();
|
|
|
|
if (next_in != next_out)
|
|
return queue[next_out];
|
|
else return null;
|
|
}
|
|
|
|
/** @specnote Does not block. Returns null if there are no matching events
|
|
* on the queue.
|
|
*/
|
|
public synchronized AWTEvent peekEvent(int id)
|
|
{
|
|
if (next != null)
|
|
return next.peekEvent(id);
|
|
|
|
int i = next_out;
|
|
while (i != next_in)
|
|
{
|
|
AWTEvent qevt = queue[i];
|
|
if (qevt.id == id)
|
|
return qevt;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
public synchronized void postEvent(AWTEvent evt)
|
|
{
|
|
if (next != null)
|
|
{
|
|
next.postEvent(evt);
|
|
return;
|
|
}
|
|
// FIXME: Security checks?
|
|
|
|
/* Check for any events already on the queue with the same source
|
|
and ID. */
|
|
int i = next_out;
|
|
while (i != next_in)
|
|
{
|
|
AWTEvent qevt = queue[i];
|
|
Object src;
|
|
if (qevt.id == evt.id
|
|
&& (src = qevt.getSource()) == evt.getSource()
|
|
&& src instanceof Component)
|
|
{
|
|
/* If there are, call coalesceEvents on the source component
|
|
to see if they can be combined. */
|
|
Component srccmp = (Component) src;
|
|
AWTEvent coalesced_evt = srccmp.coalesceEvents(qevt, evt);
|
|
if (coalesced_evt != null)
|
|
{
|
|
/* Yes. Replace the existing event with the combined event. */
|
|
queue[i] = coalesced_evt;
|
|
return;
|
|
}
|
|
break;
|
|
}
|
|
if (++i == queue.length)
|
|
i = 0;
|
|
}
|
|
|
|
queue[next_in] = evt;
|
|
if (++next_in == queue.length)
|
|
next_in = 0;
|
|
|
|
if (next_in == next_out)
|
|
{
|
|
/* Queue is full. Extend it. */
|
|
AWTEvent[] oldQueue = queue;
|
|
queue = new AWTEvent[queue.length * 2];
|
|
|
|
int len = oldQueue.length - next_out;
|
|
System.arraycopy(oldQueue, next_out, queue, 0, len);
|
|
if (next_out != 0)
|
|
System.arraycopy(oldQueue, 0, queue, len, next_out);
|
|
|
|
next_out = 0;
|
|
next_in = oldQueue.length;
|
|
}
|
|
notify();
|
|
}
|
|
|
|
/** @since JDK1.2 */
|
|
public static void invokeAndWait(Runnable runnable)
|
|
throws InterruptedException, InvocationTargetException
|
|
{
|
|
EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
|
|
Thread current = Thread.currentThread();
|
|
if (current == eq.dispatchThread)
|
|
throw new Error("Can't call invokeAndWait from event dispatch thread");
|
|
|
|
InvocationEvent ie =
|
|
new InvocationEvent(eq, runnable, current, true);
|
|
|
|
synchronized (current)
|
|
{
|
|
eq.postEvent(ie);
|
|
current.wait();
|
|
}
|
|
|
|
Exception exception;
|
|
|
|
if ((exception = ie.getException()) != null)
|
|
throw new InvocationTargetException(exception);
|
|
}
|
|
|
|
/** @since JDK1.2 */
|
|
static void invokeLater(Runnable runnable)
|
|
{
|
|
EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
|
|
|
|
InvocationEvent ie =
|
|
new InvocationEvent(eq, runnable, null, false);
|
|
|
|
eq.postEvent(ie);
|
|
}
|
|
|
|
static boolean isDispatchThread()
|
|
{
|
|
EventQueue eq = Toolkit.getDefaultToolkit().getSystemEventQueue();
|
|
return (Thread.currentThread() == eq.dispatchThread);
|
|
}
|
|
|
|
/** Allows a custom EventQueue implementation to replace this one.
|
|
* All pending events are transferred to the new queue. Calls to postEvent,
|
|
* getNextEvent, and peekEvent are forwarded to the pushed queue until it
|
|
* is removed with a pop().
|
|
*/
|
|
public synchronized void push(EventQueue newEventQueue)
|
|
{
|
|
int i = next_out;
|
|
while (i != next_in)
|
|
{
|
|
newEventQueue.postEvent(queue[i]);
|
|
next_out = i;
|
|
if (++i == queue.length)
|
|
i = 0;
|
|
}
|
|
|
|
next = newEventQueue;
|
|
newEventQueue.prev = this;
|
|
}
|
|
|
|
/** Transfer any pending events from this queue back to the parent queue that
|
|
* was previously push()ed. Event dispatch from this queue is suspended. */
|
|
protected void pop() throws EmptyStackException
|
|
{
|
|
if (prev == null)
|
|
throw new EmptyStackException();
|
|
|
|
// Don't synchronize both this and prev at the same time, or deadlock could
|
|
// occur.
|
|
synchronized (prev)
|
|
{
|
|
prev.next = null;
|
|
}
|
|
|
|
synchronized (this)
|
|
{
|
|
int i = next_out;
|
|
while (i != next_in)
|
|
{
|
|
prev.postEvent(queue[i]);
|
|
next_out = i;
|
|
if (++i == queue.length)
|
|
i = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
protected void dispatchEvent(AWTEvent evt)
|
|
{
|
|
if (evt instanceof ActiveEvent)
|
|
{
|
|
ActiveEvent active_evt = (ActiveEvent) evt;
|
|
active_evt.dispatch();
|
|
}
|
|
else
|
|
{
|
|
Object source = evt.getSource();
|
|
|
|
if (source instanceof Component)
|
|
{
|
|
Component srccmp = (Component) source;
|
|
srccmp.dispatchEvent(evt);
|
|
}
|
|
else if (source instanceof MenuComponent)
|
|
{
|
|
MenuComponent srccmp = (MenuComponent) source;
|
|
srccmp.dispatchEvent(evt);
|
|
}
|
|
}
|
|
}
|
|
}
|