# HG changeset patch
# User Frank Benoit
# Date 1199858227 -3600
# Node ID 5c24c1a67fc2ca1b6134bd238ec2e8eae68c7136
# Parent 5e5d1c9cffdb0686bb8b9c3c1d9ece64b6043ff0
Scrollable
diff -r 5e5d1c9cffdb -r 5c24c1a67fc2 dwt/internal/gtk/OS.d
--- a/dwt/internal/gtk/OS.d Wed Jan 09 06:17:26 2008 +0100
+++ b/dwt/internal/gtk/OS.d Wed Jan 09 06:57:07 2008 +0100
@@ -1992,12 +1992,12 @@
gchar* GTK_ACCEL_LABEL_GET_ACCEL_STRING( GtkAccelLabel* arg0)
{ return arg0.accel_string; }
- GtkWidget* GTK_SCROLLED_WINDOW_HSCROLLBAR( GtkScrolledWindow* arg0 )
+ static GtkWidget* GTK_SCROLLED_WINDOW_HSCROLLBAR( GtkScrolledWindow* arg0 )
{ return arg0.hscrollbar; }
- GtkWidget* GTK_SCROLLED_WINDOW_VSCROLLBAR( GtkScrolledWindow* arg0 )
+ static GtkWidget* GTK_SCROLLED_WINDOW_VSCROLLBAR( GtkScrolledWindow* arg0 )
{ return arg0.vscrollbar; }
- int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING( GtkScrolledWindow* arg0)
+ static int GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING( GtkScrolledWindow* arg0)
{
return ((cast(GtkScrolledWindowClass*) ((cast(GTypeInstance*) arg0).g_class) ).scrollbar_spacing >= 0 ?
(cast(GtkScrolledWindowClass*) ((cast(GTypeInstance*) arg0).g_class)).scrollbar_spacing : 3) ;
@@ -2133,9 +2133,15 @@
*arg2 = arg0.text[arg1];
}
+ //gtk_style_get_xthickness(arg0) (arg0)->xthickness
+ static int gtk_style_get_xthickness( GtkStyle* arg0 ) {
+ return arg0.xthickness;
+ }
+ //gtk_style_get_ythickness(arg0) (arg0)->ythickness
+ static int gtk_style_get_ythickness( GtkStyle* arg0 ) {
+ return arg0.ythickness;
+ }
/+
- gtk_style_get_xthickness(arg0) (arg0)->xthickness
- gtk_style_get_ythickness(arg0) (arg0)->ythickness
gtk_style_get_fg_gc(arg0, arg1, arg2) *arg2 = (arg0)->fg_gc[arg1]
gtk_style_get_bg_gc(arg0, arg1, arg2) *arg2 = (arg0)->bg_gc[arg1]
gtk_style_get_light_gc(arg0, arg1, arg2) *arg2 = (arg0)->light_gc[arg1]
diff -r 5e5d1c9cffdb -r 5c24c1a67fc2 dwt/internal/gtk/c/gtktypes.d
--- a/dwt/internal/gtk/c/gtktypes.d Wed Jan 09 06:17:26 2008 +0100
+++ b/dwt/internal/gtk/c/gtktypes.d Wed Jan 09 06:57:07 2008 +0100
@@ -4334,7 +4334,15 @@
* the page size.
* In a GtkScrollbar this is the size of the area which is currently visible.
*/
-public struct GtkAdjustment{}
+public struct GtkAdjustment{
+GtkObject parent_instance;
+double lower;
+double upper;
+double value;
+double step_increment;
+double page_increment;
+double page_size;
+}
/**
diff -r 5e5d1c9cffdb -r 5c24c1a67fc2 dwt/widgets/ScrollBar.d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/widgets/ScrollBar.d Wed Jan 09 06:57:07 2008 +0100
@@ -0,0 +1,746 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+module dwt.widgets.ScrollBar;
+
+import dwt.widgets.Control;
+import dwt.widgets.Scrollable;
+import dwt.internal.gtk.c.gtktypes;
+
+class ScrollBar : Control {
+ GtkAdjustment* adjustmentHandle;
+ Scrollable parent;
+}
+
+/+
+import dwt.SWT;
+import dwt.internal.gtk.*;
+import dwt.graphics.*;
+import dwt.events.*;
+
+/**
+ * Instances of this class are selectable user interface
+ * objects that represent a range of positive, numeric values.
+ *
+ * At any given moment, a given scroll bar will have a
+ * single 'selection' that is considered to be its
+ * value, which is constrained to be within the range of
+ * values the scroll bar represents (that is, between its
+ * minimum and maximum values).
+ *
+ * Typically, scroll bars will be made up of five areas:
+ *
+ * - an arrow button for decrementing the value
+ * - a page decrement area for decrementing the value by a larger amount
+ * - a thumb for modifying the value by mouse dragging
+ * - a page increment area for incrementing the value by a larger amount
+ * - an arrow button for incrementing the value
+ *
+ * Based on their style, scroll bars are either HORIZONTAL
+ * (which have a left facing button for decrementing the value and a
+ * right facing button for incrementing it) or VERTICAL
+ * (which have an upward facing button for decrementing the value
+ * and a downward facing buttons for incrementing it).
+ *
+ * On some platforms, the size of the scroll bar's thumb can be
+ * varied relative to the magnitude of the range of values it
+ * represents (that is, relative to the difference between its
+ * maximum and minimum values). Typically, this is used to
+ * indicate some proportional value such as the ratio of the
+ * visible area of a document to the total amount of space that
+ * it would take to display it. SWT supports setting the thumb
+ * size even if the underlying platform does not, but in this
+ * case the appearance of the scroll bar will not change.
+ *
+ * Scroll bars are created by specifying either H_SCROLL
,
+ * V_SCROLL
or both when creating a Scrollable
.
+ * They are accessed from the Scrollable
using
+ * getHorizontalBar
and getVerticalBar
.
+ *
+ * Note: Scroll bars are not Controls. On some platforms, scroll bars
+ * that appear as part of some standard controls such as a text or list
+ * have no operating system resources and are not children of the control.
+ * For this reason, scroll bars are treated specially. To create a control
+ * that looks like a scroll bar but has operating system resources, use
+ * Slider
.
+ *
+ *
+ * - Styles:
+ * - HORIZONTAL, VERTICAL
+ * - Events:
+ * - Selection
+ *
+ *
+ * Note: Only one of the styles HORIZONTAL and VERTICAL may be specified.
+ *
+ * IMPORTANT: This class is not intended to be subclassed.
+ *
+ *
+ * @see Slider
+ * @see Scrollable
+ * @see Scrollable#getHorizontalBar
+ * @see Scrollable#getVerticalBar
+ */
+public class ScrollBar extends Widget {
+ Scrollable parent;
+ int /*long*/ adjustmentHandle;
+ int detail;
+ boolean dragSent;
+
+ScrollBar () {
+}
+
+/**
+* Creates a new instance of the widget.
+*/
+ScrollBar (Scrollable parent, int style) {
+ super (parent, checkStyle (style));
+ this.parent = parent;
+ createWidget (0);
+}
+
+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the user changes the receiver's value, by sending
+ * it one of the messages defined in the SelectionListener
+ * interface.
+ *
+ * When widgetSelected
is called, the event object detail field contains one of the following values:
+ * SWT.NONE
- for the end of a drag.
+ * SWT.DRAG
.
+ * SWT.HOME
.
+ * SWT.END
.
+ * SWT.ARROW_DOWN
.
+ * SWT.ARROW_UP
.
+ * SWT.PAGE_DOWN
.
+ * SWT.PAGE_UP
.
+ * widgetDefaultSelected
is not called.
+ *
+ *
+ * @param listener the listener which should be notified when the user changes the receiver's value
+ *
+ * @exception IllegalArgumentException
+ * - ERROR_NULL_ARGUMENT - if the listener is null
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ *
+ * @see SelectionListener
+ * @see #removeSelectionListener
+ * @see SelectionEvent
+ */
+public void addSelectionListener (SelectionListener listener) {
+ checkWidget ();
+ if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+ TypedListener typedListener = new TypedListener (listener);
+ addListener (SWT.Selection,typedListener);
+ addListener (SWT.DefaultSelection,typedListener);
+}
+
+static int checkStyle (int style) {
+ return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
+}
+
+void deregister () {
+ super.deregister ();
+ if (adjustmentHandle != 0) display.removeWidget (adjustmentHandle);
+}
+
+/**
+ * Returns true
if the receiver is enabled, and
+ * false
otherwise. A disabled control is typically
+ * not selectable from the user interface and draws with an
+ * inactive or "grayed" look.
+ *
+ * @return the receiver's enabled state
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ *
+ * @see #isEnabled
+ */
+public boolean getEnabled () {
+ checkWidget ();
+ if (handle != 0) return OS.GTK_WIDGET_SENSITIVE (handle);
+ return true;
+}
+
+/**
+ * Returns the amount that the receiver's value will be
+ * modified by when the up/down (or right/left) arrows
+ * are pressed.
+ *
+ * @return the increment
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public int getIncrement () {
+ checkWidget ();
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ return (int) adjustment.step_increment;
+}
+
+/**
+ * Returns the maximum value which the receiver will allow.
+ *
+ * @return the maximum
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public int getMaximum () {
+ checkWidget ();
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ return (int) adjustment.upper;
+}
+
+/**
+ * Returns the minimum value which the receiver will allow.
+ *
+ * @return the minimum
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public int getMinimum () {
+ checkWidget ();
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ return (int) adjustment.lower;
+}
+
+/**
+ * Returns the amount that the receiver's value will be
+ * modified by when the page increment/decrement areas
+ * are selected.
+ *
+ * @return the page increment
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public int getPageIncrement () {
+ checkWidget ();
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ return (int) adjustment.page_increment;
+}
+
+/**
+ * Returns the receiver's parent, which must be a Scrollable.
+ *
+ * @return the receiver's parent
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public Scrollable getParent () {
+ checkWidget ();
+ return parent;
+}
+
+/**
+ * Returns the single 'selection' that is the receiver's value.
+ *
+ * @return the selection
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public int getSelection () {
+ checkWidget ();
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ return (int) adjustment.value;
+}
+
+/**
+ * Returns a point describing the receiver's size. The
+ * x coordinate of the result is the width of the receiver.
+ * The y coordinate of the result is the height of the
+ * receiver.
+ *
+ * @return the receiver's size
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public Point getSize () {
+ checkWidget ();
+ if (handle == 0) return new Point (0,0);
+ GtkRequisition requisition = new GtkRequisition ();
+ OS.gtk_widget_size_request (handle, requisition);
+ return new Point (requisition.width, requisition.height);
+}
+
+/**
+ * Returns the size of the receiver's thumb relative to the
+ * difference between its maximum and minimum values.
+ *
+ * @return the thumb value
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ *
+ * @see ScrollBar
+ */
+public int getThumb () {
+ checkWidget ();
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ return (int) adjustment.page_size;
+}
+
+/**
+ * Returns true
if the receiver is visible, and
+ * false
otherwise.
+ *
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, this method
+ * may still indicate that it is considered visible even though
+ * it may not actually be showing.
+ *
+ *
+ * @return the receiver's visibility state
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public boolean getVisible () {
+ checkWidget ();
+ int /*long*/ scrolledHandle = parent.scrolledHandle;
+ int [] hsp = new int [1], vsp = new int [1];
+ OS.gtk_scrolled_window_get_policy (scrolledHandle, hsp, vsp);
+ if ((style & SWT.HORIZONTAL) != 0) {
+ return hsp [0] != OS.GTK_POLICY_NEVER;
+ } else {
+ return vsp [0] != OS.GTK_POLICY_NEVER;
+ }
+}
+
+int /*long*/ gtk_button_press_event (int /*long*/ widget, int /*long*/ eventPtr) {
+ int /*long*/ result = super.gtk_button_press_event (widget, eventPtr);
+ if (result != 0) return result;
+ detail = OS.GTK_SCROLL_NONE;
+ dragSent = false;
+ return result;
+}
+
+int /*long*/ gtk_change_value (int /*long*/ widget, int /*long*/ scroll, int /*long*/ value1, int /*long*/ value2) {
+ detail = (int)/*64*/scroll;
+ return 0;
+}
+
+int /*long*/ gtk_value_changed (int /*long*/ adjustment) {
+ Event event = new Event ();
+ dragSent = detail == OS.GTK_SCROLL_JUMP;
+ switch (detail) {
+ case OS.GTK_SCROLL_NONE: event.detail = SWT.NONE; break;
+ case OS.GTK_SCROLL_JUMP: event.detail = SWT.DRAG; break;
+ case OS.GTK_SCROLL_START: event.detail = SWT.HOME; break;
+ case OS.GTK_SCROLL_END: event.detail = SWT.END; break;
+ case OS.GTK_SCROLL_PAGE_DOWN:
+ case OS.GTK_SCROLL_PAGE_RIGHT:
+ case OS.GTK_SCROLL_PAGE_FORWARD: event.detail = SWT.PAGE_DOWN; break;
+ case OS.GTK_SCROLL_PAGE_UP:
+ case OS.GTK_SCROLL_PAGE_LEFT:
+ case OS.GTK_SCROLL_PAGE_BACKWARD: event.detail = SWT.PAGE_UP; break;
+ case OS.GTK_SCROLL_STEP_DOWN:
+ case OS.GTK_SCROLL_STEP_RIGHT:
+ case OS.GTK_SCROLL_STEP_FORWARD: event.detail = SWT.ARROW_DOWN; break;
+ case OS.GTK_SCROLL_STEP_UP:
+ case OS.GTK_SCROLL_STEP_LEFT:
+ case OS.GTK_SCROLL_STEP_BACKWARD: event.detail = SWT.ARROW_UP; break;
+ }
+ detail = OS.GTK_SCROLL_NONE;
+ if (!dragSent) detail = OS.GTK_SCROLL_NONE;
+ postEvent (SWT.Selection, event);
+ parent.updateScrollBarValue (this);
+ return 0;
+}
+
+int /*long*/ gtk_event_after (int /*long*/ widget, int /*long*/ gdkEvent) {
+ GdkEvent gtkEvent = new GdkEvent ();
+ OS.memmove (gtkEvent, gdkEvent, GdkEvent.sizeof);
+ switch (gtkEvent.type) {
+ case OS.GDK_BUTTON_RELEASE: {
+ GdkEventButton gdkEventButton = new GdkEventButton ();
+ OS.memmove (gdkEventButton, gdkEvent, GdkEventButton.sizeof);
+ if (gdkEventButton.button == 1 && detail == SWT.DRAG) {
+ if (!dragSent) {
+ Event event = new Event ();
+ event.detail = SWT.DRAG;
+ postEvent (SWT.Selection, event);
+ }
+ postEvent (SWT.Selection);
+ }
+ detail = OS.GTK_SCROLL_NONE;
+ dragSent = false;
+ break;
+ }
+ }
+ return super.gtk_event_after (widget, gdkEvent);
+}
+
+void hookEvents () {
+ super.hookEvents ();
+ if (OS.GTK_VERSION >= OS.VERSION (2, 6, 0)) {
+ OS.g_signal_connect_closure (handle, OS.change_value, display.closures [CHANGE_VALUE], false);
+ }
+ OS.g_signal_connect_closure (adjustmentHandle, OS.value_changed, display.closures [VALUE_CHANGED], false);
+ OS.g_signal_connect_closure_by_id (handle, display.signalIds [EVENT_AFTER], 0, display.closures [EVENT_AFTER], false);
+ OS.g_signal_connect_closure_by_id (handle, display.signalIds [BUTTON_PRESS_EVENT], 0, display.closures [BUTTON_PRESS_EVENT], false);
+}
+
+/**
+ * Returns true
if the receiver is enabled and all
+ * of the receiver's ancestors are enabled, and false
+ * otherwise. A disabled control is typically not selectable from the
+ * user interface and draws with an inactive or "grayed" look.
+ *
+ * @return the receiver's enabled state
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ *
+ * @see #getEnabled
+ */
+public boolean isEnabled () {
+ checkWidget ();
+ return getEnabled () && getParent ().getEnabled ();
+}
+
+/**
+ * Returns true
if the receiver is visible and all
+ * of the receiver's ancestors are visible and false
+ * otherwise.
+ *
+ * @return the receiver's visibility state
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ *
+ * @see #getVisible
+ */
+public boolean isVisible () {
+ checkWidget ();
+ return getVisible () && getParent ().isVisible ();
+}
+
+void register () {
+ super.register ();
+ if (adjustmentHandle != 0) display.addWidget (adjustmentHandle, this);
+}
+
+void releaseParent () {
+ super.releaseParent ();
+ if (parent.horizontalBar == this) parent.horizontalBar = null;
+ if (parent.verticalBar == this) parent.verticalBar = null;
+}
+
+void releaseWidget () {
+ super.releaseWidget ();
+ parent = null;
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the user changes the receiver's value.
+ *
+ * @param listener the listener which should no longer be notified
+ *
+ * @exception IllegalArgumentException
+ * - ERROR_NULL_ARGUMENT - if the listener is null
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ *
+ * @see SelectionListener
+ * @see #addSelectionListener
+ */
+public void removeSelectionListener (SelectionListener listener) {
+ checkWidget ();
+ if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (eventTable == null) return;
+ eventTable.unhook (SWT.Selection, listener);
+ eventTable.unhook (SWT.DefaultSelection,listener);
+}
+
+/**
+ * Enables the receiver if the argument is true
,
+ * and disables it otherwise. A disabled control is typically
+ * not selectable from the user interface and draws with an
+ * inactive or "grayed" look.
+ *
+ * @param enabled the new enabled state
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setEnabled (boolean enabled) {
+ checkWidget ();
+ if (handle != 0) OS.gtk_widget_set_sensitive (handle, enabled);
+}
+
+/**
+ * Sets the amount that the receiver's value will be
+ * modified by when the up/down (or right/left) arrows
+ * are pressed to the argument, which must be at least
+ * one.
+ *
+ * @param value the new increment (must be greater than zero)
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setIncrement (int value) {
+ checkWidget ();
+ if (value < 1) return;
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ adjustment.step_increment = (float) value;
+ OS.memmove (adjustmentHandle, adjustment);
+ OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+ OS.gtk_adjustment_changed (adjustmentHandle);
+ OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+}
+
+/**
+ * Sets the maximum. If this value is negative or less than or
+ * equal to the minimum, the value is ignored. If necessary, first
+ * the thumb and then the selection are adjusted to fit within the
+ * new range.
+ *
+ * @param value the new maximum
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setMaximum (int value) {
+ checkWidget ();
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ int minimum = (int) adjustment.lower;
+ if (value <= minimum) return;
+ adjustment.upper = value;
+ adjustment.page_size = Math.min ((int)adjustment.page_size, value - minimum);
+ adjustment.value = Math.min ((int)adjustment.value, (int)(value - adjustment.page_size));
+ OS.memmove (adjustmentHandle, adjustment);
+ OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+ OS.gtk_adjustment_changed (adjustmentHandle);
+ OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+}
+
+/**
+ * Sets the minimum value. If this value is negative or greater
+ * than or equal to the maximum, the value is ignored. If necessary,
+ * first the thumb and then the selection are adjusted to fit within
+ * the new range.
+ *
+ * @param value the new minimum
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setMinimum (int value) {
+ checkWidget ();
+ if (value < 0) return;
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ int maximum = (int) adjustment.upper;
+ if (value >= maximum) return;
+ adjustment.lower = value;
+ adjustment.page_size = Math.min ((int)adjustment.page_size, maximum - value);
+ adjustment.value = Math.max ((int)adjustment.value, value);
+ OS.memmove (adjustmentHandle, adjustment);
+ OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+ OS.gtk_adjustment_changed (adjustmentHandle);
+ OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+}
+
+/**
+ * Sets the amount that the receiver's value will be
+ * modified by when the page increment/decrement areas
+ * are selected to the argument, which must be at least
+ * one.
+ *
+ * @param value the page increment (must be greater than zero)
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setPageIncrement (int value) {
+ checkWidget ();
+ if (value < 1) return;
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ adjustment.page_increment = (float) value;
+ OS.memmove (adjustmentHandle, adjustment);
+ OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+ OS.gtk_adjustment_changed (adjustmentHandle);
+ OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+}
+
+/**
+ * Sets the single selection that is the receiver's
+ * value to the argument which must be greater than or equal
+ * to zero.
+ *
+ * @param selection the new selection (must be zero or greater)
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setSelection (int value) {
+ checkWidget ();
+ value = Math.min (value, getMaximum() - getThumb());
+ OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+ OS.gtk_adjustment_set_value (adjustmentHandle, value);
+ OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+}
+
+/**
+ * Sets the size of the receiver's thumb relative to the
+ * difference between its maximum and minimum values. This new
+ * value will be ignored if it is less than one, and will be
+ * clamped if it exceeds the receiver's current range.
+ *
+ * @param value the new thumb value, which must be at least one and not
+ * larger than the size of the current range
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setThumb (int value) {
+ checkWidget ();
+ if (value < 1) return;
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ value = (int) Math.min (value, (int)(adjustment.upper - adjustment.lower));
+ adjustment.page_size = (double) value;
+ adjustment.value = Math.min ((int)adjustment.value, (int)(adjustment.upper - value));
+ OS.memmove (adjustmentHandle, adjustment);
+ OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+ OS.gtk_adjustment_changed (adjustmentHandle);
+ OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+}
+
+/**
+ * Sets the receiver's selection, minimum value, maximum
+ * value, thumb, increment and page increment all at once.
+ *
+ * Note: This is similar to setting the values individually
+ * using the appropriate methods, but may be implemented in a
+ * more efficient fashion on some platforms.
+ *
+ *
+ * @param selection the new selection value
+ * @param minimum the new minimum value
+ * @param maximum the new maximum value
+ * @param thumb the new thumb value
+ * @param increment the new increment value
+ * @param pageIncrement the new pageIncrement value
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setValues (int selection, int minimum, int maximum, int thumb, int increment, int pageIncrement) {
+ checkWidget ();
+ if (minimum < 0) return;
+ if (maximum < 0) return;
+ if (thumb < 1) return;
+ if (increment < 1) return;
+ if (pageIncrement < 1) return;
+ thumb = Math.min (thumb, maximum - minimum);
+ GtkAdjustment adjustment = new GtkAdjustment ();
+ OS.memmove (adjustment, adjustmentHandle);
+ adjustment.lower = minimum;
+ adjustment.upper = maximum;
+ adjustment.step_increment = increment;
+ adjustment.page_increment = pageIncrement;
+ adjustment.page_size = thumb;
+ adjustment.value = Math.min (Math.max (selection, minimum), maximum - thumb);
+ OS.memmove (adjustmentHandle, adjustment);
+ OS.g_signal_handlers_block_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+ OS.gtk_adjustment_changed (adjustmentHandle);
+ OS.gtk_adjustment_value_changed (adjustmentHandle);
+ OS.g_signal_handlers_unblock_matched (adjustmentHandle, OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, VALUE_CHANGED);
+}
+
+/**
+ * Marks the receiver as visible if the argument is true
,
+ * and marks it invisible otherwise.
+ *
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, marking
+ * it visible may not actually cause it to be displayed.
+ *
+ *
+ * @param visible the new visibility state
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public void setVisible (boolean visible) {
+ checkWidget ();
+ parent.setScrollBarVisible (this, visible);
+}
+
+}
++/
\ No newline at end of file
diff -r 5e5d1c9cffdb -r 5c24c1a67fc2 dwt/widgets/Scrollable.d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/widgets/Scrollable.d Wed Jan 09 06:57:07 2008 +0100
@@ -0,0 +1,386 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+module dwt.widgets.Scrollable;
+
+
+import dwt.SWT;
+import dwt.internal.gtk.OS;
+import dwt.internal.gtk.c.gdktypes;
+import dwt.internal.gtk.c.gtktypes;
+import dwt.graphics.Rectangle;
+import dwt.widgets.Composite;
+import dwt.widgets.Control;
+import dwt.widgets.Display;
+import dwt.widgets.ScrollBar;
+import dwt.widgets.Widget;
+
+import tango.stdc.string;
+import tango.stdc.stringz;
+
+/**
+ * This class is the abstract superclass of all classes which
+ * represent controls that have standard scroll bars.
+ *
+ * - Styles:
+ * - H_SCROLL, V_SCROLL
+ * - Events:
+ *
- (none)
+ *
+ *
+ * IMPORTANT: This class is intended to be subclassed only
+ * within the SWT implementation.
+ *
+ */
+public abstract class Scrollable : Control {
+ GtkScrolledWindow* scrolledHandle;
+ ScrollBar horizontalBar, verticalBar;
+
+/**
+ * Prevents uninitialized instances from being created outside the package.
+ */
+this () {}
+
+/**
+ * Constructs a new instance of this class given its parent
+ * and a style value describing its behavior and appearance.
+ *
+ * The style value is either one of the style constants defined in
+ * class SWT
which is applicable to instances of this
+ * class, or must be built by bitwise OR'ing together
+ * (that is, using the int
"|" operator) two or more
+ * of those SWT
style constants. The class description
+ * lists the style constants that are applicable to the class.
+ * Style bits are also inherited from superclasses.
+ *
+ *
+ * @param parent a composite control which will be the parent of the new instance (cannot be null)
+ * @param style the style of control to construct
+ *
+ * @exception IllegalArgumentException
+ * - ERROR_NULL_ARGUMENT - if the parent is null
+ *
+ * @exception SWTException
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent
+ * - ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass
+ *
+ *
+ * @see SWT#H_SCROLL
+ * @see SWT#V_SCROLL
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
+ */
+public this (Composite parent, int style) {
+ super (parent, style);
+}
+
+GtkWidget* clientHandle () {
+ return handle;
+}
+
+/**
+ * Given a desired client area for the receiver
+ * (as described by the arguments), returns the bounding
+ * rectangle which would be required to produce that client
+ * area.
+ *
+ * In other words, it returns a rectangle such that, if the
+ * receiver's bounds were set to that rectangle, the area
+ * of the receiver which is capable of displaying data
+ * (that is, not covered by the "trimmings") would be the
+ * rectangle described by the arguments (relative to the
+ * receiver's parent).
+ *
+ *
+ * @param x the desired x coordinate of the client area
+ * @param y the desired y coordinate of the client area
+ * @param width the desired width of the client area
+ * @param height the desired height of the client area
+ * @return the required bounds to produce the given client area
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ *
+ * @see #getClientArea
+ */
+public Rectangle computeTrim (int x, int y, int width, int height) {
+ checkWidget();
+ int border = 0;
+ if (fixedHandle !is null) border += OS.gtk_container_get_border_width (cast(GtkContainer*)fixedHandle);
+ if (scrolledHandle !is null) border += OS.gtk_container_get_border_width (cast(GtkContainer*)scrolledHandle);
+ int trimX = x - border, trimY = y - border;
+ int trimWidth = width + (border * 2), trimHeight = height + (border * 2);
+ trimHeight += hScrollBarWidth ();
+ trimWidth += vScrollBarWidth ();
+ if (scrolledHandle !is null) {
+ if (OS.gtk_scrolled_window_get_shadow_type (cast(GtkScrolledWindow*)scrolledHandle) !is OS.GTK_SHADOW_NONE) {
+ auto style = OS.gtk_widget_get_style (cast(GtkWidget*)scrolledHandle);
+ int xthickness = OS.gtk_style_get_xthickness (style);
+ int ythickness = OS.gtk_style_get_ythickness (style);
+ trimX -= xthickness;
+ trimY -= ythickness;
+ trimWidth += xthickness * 2;
+ trimHeight += ythickness * 2;
+ }
+ }
+ return new Rectangle (trimX, trimY, trimWidth, trimHeight);
+}
+
+ScrollBar createScrollBar (int style) {
+ if (scrolledHandle is null) return null;
+ ScrollBar bar = new ScrollBar ();
+ bar.parent = this;
+ bar.style = style;
+ bar.display = display;
+ bar.state |= HANDLE;
+ if ((style & SWT.H_SCROLL) !is 0) {
+ bar.handle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR (scrolledHandle);
+ bar.adjustmentHandle = OS.gtk_scrolled_window_get_hadjustment (scrolledHandle);
+ } else {
+ bar.handle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR (scrolledHandle);
+ bar.adjustmentHandle = OS.gtk_scrolled_window_get_vadjustment (cast(GtkScrolledWindow*)scrolledHandle);
+ }
+ bar.hookEvents ();
+ bar.register ();
+ return bar;
+}
+
+void createWidget (int index) {
+ super.createWidget (index);
+ if ((style & SWT.H_SCROLL) !is 0) horizontalBar = createScrollBar (SWT.H_SCROLL);
+ if ((style & SWT.V_SCROLL) !is 0) verticalBar = createScrollBar (SWT.V_SCROLL);
+}
+
+void deregister () {
+ super.deregister ();
+ if (scrolledHandle !is null) display.removeWidget (cast(GtkWidget*)scrolledHandle);
+}
+
+public int getBorderWidth () {
+ checkWidget();
+ int border = 0;
+ if (fixedHandle !is null) border += OS.gtk_container_get_border_width (cast(GtkContainer*)fixedHandle);
+ if (scrolledHandle !is null) {
+ border += OS.gtk_container_get_border_width (cast(GtkContainer*)scrolledHandle);
+ if (OS.gtk_scrolled_window_get_shadow_type (cast(GtkScrolledWindow*)scrolledHandle) !is OS.GTK_SHADOW_NONE) {
+ border += OS.gtk_style_get_xthickness (OS.gtk_widget_get_style (cast(GtkWidget*)scrolledHandle));
+ }
+ }
+ return border;
+}
+
+/**
+ * Returns a rectangle which describes the area of the
+ * receiver which is capable of displaying data (that is,
+ * not covered by the "trimmings").
+ *
+ * @return the client area
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ *
+ * @see #computeTrim
+ */
+public Rectangle getClientArea () {
+ checkWidget ();
+ forceResize ();
+ auto clientHandle = clientHandle ();
+ int x = OS.GTK_WIDGET_X (clientHandle);
+ int y = OS.GTK_WIDGET_Y (clientHandle);
+ int width = (state & ZERO_WIDTH) !is 0 ? 0 : OS.GTK_WIDGET_WIDTH (clientHandle);
+ int height = (state & ZERO_HEIGHT) !is 0 ? 0 : OS.GTK_WIDGET_HEIGHT (clientHandle);
+ return new Rectangle (x, y, width, height);
+}
+/**
+ * Returns the receiver's horizontal scroll bar if it has
+ * one, and null if it does not.
+ *
+ * @return the horizontal scroll bar (or null)
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public ScrollBar getHorizontalBar () {
+ checkWidget ();
+ return horizontalBar;
+}
+/**
+ * Returns the receiver's vertical scroll bar if it has
+ * one, and null if it does not.
+ *
+ * @return the vertical scroll bar (or null)
+ *
+ * @exception SWTException
+ * - ERROR_WIDGET_DISPOSED - if the receiver has been disposed
+ * - ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver
+ *
+ */
+public ScrollBar getVerticalBar () {
+ checkWidget ();
+ return verticalBar;
+}
+
+int /*long*/ gtk_scroll_event (GtkWidget* widget, GdkEventScroll* eventPtr) {
+ auto result = super.gtk_scroll_event (widget, eventPtr);
+
+ /*
+ * Feature in GTK. Scrolled windows do not scroll if the scrollbars
+ * are hidden. This is not a bug, but is inconsistent with other platforms.
+ * The fix is to set the adjustment values directly.
+ */
+ if ((state & CANVAS) !is 0) {
+ ScrollBar scrollBar;
+ GdkEventScroll* gdkEvent = new GdkEventScroll ();
+ memmove (gdkEvent, eventPtr, GdkEventScroll.sizeof);
+ if (gdkEvent.direction is OS.GDK_SCROLL_UP || gdkEvent.direction is OS.GDK_SCROLL_DOWN) {
+ scrollBar = verticalBar;
+ } else {
+ scrollBar = horizontalBar;
+ }
+ if (scrollBar !is null && !OS.GTK_WIDGET_VISIBLE (scrollBar.handle) && scrollBar.getEnabled()) {
+ GtkAdjustment* adjustment = new GtkAdjustment ();
+ memmove (adjustment, scrollBar.adjustmentHandle, GtkAdjustment.sizeof );
+ /* Calculate wheel delta to match GTK+ 2.4 and higher */
+ int wheel_delta = cast(int) Math.pow(adjustment.page_size, 2.0 / 3.0);
+ if (gdkEvent.direction is OS.GDK_SCROLL_UP || gdkEvent.direction is OS.GDK_SCROLL_LEFT)
+ wheel_delta = -wheel_delta;
+ int value = cast(int) Math.max(adjustment.lower,
+ Math.min(adjustment.upper - adjustment.page_size, adjustment.value + wheel_delta));
+ OS.gtk_adjustment_set_value (scrollBar.adjustmentHandle, value);
+ return 1;
+ }
+ }
+ return result;
+}
+
+int hScrollBarWidth() {
+ if (horizontalBar is null) return 0;
+ auto hBarHandle = OS.GTK_SCROLLED_WINDOW_HSCROLLBAR(scrolledHandle);
+ if (hBarHandle is null) return 0;
+ GtkRequisition* requisition = new GtkRequisition();
+ OS.gtk_widget_size_request(cast(GtkWidget*)hBarHandle, requisition);
+ int spacing = OS.GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(scrolledHandle);
+ return requisition.height + spacing;
+}
+
+bool sendLeaveNotify () {
+ return scrolledHandle !is null;
+}
+
+void setOrientation () {
+ super.setOrientation ();
+ if ((style & SWT.RIGHT_TO_LEFT) !is 0) {
+ if (scrolledHandle !is null) {
+ OS.gtk_widget_set_direction (cast(GtkWidget*)scrolledHandle,cast(GtkTextDirection) OS.GTK_TEXT_DIR_RTL);
+ }
+ }
+}
+
+bool setScrollBarVisible (ScrollBar bar, bool visible) {
+ if (scrolledHandle is null) return false;
+ GtkPolicyType hsp, vsp;
+ OS.gtk_scrolled_window_get_policy (scrolledHandle, &hsp, &vsp);
+ GtkPolicyType policy = cast(GtkPolicyType)( visible ? OS.GTK_POLICY_ALWAYS : OS.GTK_POLICY_NEVER);
+ if ((bar.style & SWT.HORIZONTAL) !is 0) {
+ if (hsp is policy) return false;
+ hsp = policy;
+ } else {
+ if (vsp is policy) return false;
+ vsp = policy;
+ }
+ OS.gtk_scrolled_window_set_policy (scrolledHandle, hsp, vsp);
+ bar.sendEvent (visible ? SWT.Show : SWT.Hide);
+ sendEvent (SWT.Resize);
+ return true;
+}
+
+void redrawBackgroundImage () {
+}
+
+void redrawWidget (int x, int y, int width, int height, bool redrawAll, bool all, bool trim) {
+ super.redrawWidget (x, y, width, height, redrawAll, all, trim);
+ if ((OS.GTK_WIDGET_FLAGS (handle) & OS.GTK_REALIZED) is 0) return;
+ if (!trim) return;
+ auto topHandle = topHandle (), paintHandle = paintHandle ();
+ if (topHandle is paintHandle) return;
+ auto window = OS.GTK_WIDGET_WINDOW (topHandle);
+ GdkRectangle* rect = new GdkRectangle ();
+ if (redrawAll) {
+ rect.width = OS.GTK_WIDGET_WIDTH (topHandle);
+ rect.height = OS.GTK_WIDGET_HEIGHT (topHandle);
+ } else {
+ int destX, destY;
+ OS.gtk_widget_translate_coordinates (cast(GtkWidget*)paintHandle, topHandle, x, y, &destX, &destY);
+ rect.x = destX;
+ rect.y = destY;
+ rect.width = width;
+ rect.height = height;
+ }
+ OS.gdk_window_invalidate_rect (window, rect, all);
+}
+
+void register () {
+ super.register ();
+ if (scrolledHandle !is null) display.addWidget (cast(GtkWidget*)scrolledHandle, this);
+}
+
+void releaseHandle () {
+ super.releaseHandle ();
+ scrolledHandle = null;
+}
+
+void releaseChildren (bool destroy) {
+ if (horizontalBar !is null) {
+ horizontalBar.release (false);
+ horizontalBar = null;
+ }
+ if (verticalBar !is null) {
+ verticalBar.release (false);
+ verticalBar = null;
+ }
+ super.releaseChildren (destroy);
+}
+
+void resizeHandle (int width, int height) {
+ if (fixedHandle !is null) OS.gtk_widget_set_size_request (cast(GtkWidget*)fixedHandle, width, height);
+ OS.gtk_widget_set_size_request (scrolledHandle !is null ? cast(GtkWidget*)scrolledHandle : handle, width, height);
+}
+
+void showWidget () {
+ super.showWidget ();
+ if (scrolledHandle !is null) OS.gtk_widget_show (cast(GtkWidget*)scrolledHandle);
+}
+
+GtkWidget* topHandle () {
+ if (fixedHandle !is null) return fixedHandle;
+ if (scrolledHandle !is null) return cast(GtkWidget*)scrolledHandle;
+ return super.topHandle ();
+}
+
+void updateScrollBarValue (ScrollBar bar) {
+ redrawBackgroundImage ();
+}
+
+int vScrollBarWidth() {
+ if (verticalBar is null) return 0;
+ auto vBarHandle = OS.GTK_SCROLLED_WINDOW_VSCROLLBAR(scrolledHandle);
+ if (vBarHandle is null) return 0;
+ GtkRequisition* requisition = new GtkRequisition();
+ OS.gtk_widget_size_request (cast(GtkWidget*)vBarHandle, requisition);
+ int spacing = OS.GTK_SCROLLED_WINDOW_SCROLLBAR_SPACING(scrolledHandle);
+ return requisition.width + spacing;
+}
+}