# HG changeset patch
# User Frank Benoit
# Date 1200145803 -3600
# Node ID f30b84b656a573a3d7506f78cbcb5d6fdf6eddd1
# Parent a4880dcb413993f066f588b848ac20a61f850f21
Spinner
diff -r a4880dcb4139 -r f30b84b656a5 dwt/internal/gtk/OS.d
--- a/dwt/internal/gtk/OS.d Sat Jan 12 13:39:54 2008 +0100
+++ b/dwt/internal/gtk/OS.d Sat Jan 12 14:50:03 2008 +0100
@@ -21,6 +21,7 @@
import dwt.internal.Platform;
import tango.core.Traits;
+import tango.stdc.locale;
import dwt.internal.c.gtk,
dwt.internal.c.gdk,
@@ -152,6 +153,7 @@
public alias dwt.internal.c.gtk.GtkTextBuffer GtkTextBuffer;
public alias dwt.internal.c.gtk.GtkScale GtkScale;
public alias dwt.internal.c.gtk.GtkRange GtkRange;
+public alias dwt.internal.c.gtk.GtkSpinButton GtkSpinButton;
public alias dwt.internal.c.Xlib.XErrorEvent XErrorEvent;
public alias dwt.internal.c.Xlib.XExposeEvent XExposeEvent;
@@ -218,6 +220,9 @@
return g_threads_got_initialized;
}
+private char* localeconv_decimal_point(){
+ return localeconv().decimal_point;
+}
// fontconfig.h
struct FcConfig{};
@@ -777,7 +782,7 @@
public static int gtk_micro_version(){
return .gtk_micro_version;
}
-// mixin ForwardGtkOsCFunc!(localeconv_decimal_point);
+ mixin ForwardGtkOsCFunc!(localeconv_decimal_point);
// mixin ForwardGtkOsCFunc!(realpath);
// mixin ForwardGtkOsCFunc!(X_EVENT_TYPE);
diff -r a4880dcb4139 -r f30b84b656a5 dwt/widgets/Spinner.d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dwt/widgets/Spinner.d Sat Jan 12 14:50:03 2008 +0100
@@ -0,0 +1,1060 @@
+/*******************************************************************************
+ * 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.Spinner;
+
+
+import dwt.widgets.Composite;
+import dwt.widgets.TypedListener;
+import dwt.widgets.Event;
+import dwt.widgets.Widget;
+import dwt.SWT;
+import dwt.internal.gtk.OS;
+import dwt.graphics.Point;
+import dwt.graphics.Rectangle;
+import dwt.events.SelectionListener;
+import dwt.events.SelectionEvent;
+import dwt.events.ModifyListener;
+import dwt.events.VerifyListener;
+
+import tango.stdc.stringz;
+import tango.util.Convert;
+import Math = tango.math.Math;
+static import tango.stdc.string;
+static import tango.text.Util;
+import Unicode = tango.text.Unicode;
+
+/**
+ * Instances of this class are selectable user interface
+ * objects that allow the user to enter and modify numeric
+ * values.
+ *
+ * Note that although this class is a subclass of Composite
,
+ * it does not make sense to add children to it, or set a layout on it.
+ *
+ *
+ * - Styles:
+ * - READ_ONLY, WRAP
+ * - Events:
+ * - Selection, Modify, Verify
+ *
+ *
+ * IMPORTANT: This class is not intended to be subclassed.
+ *
+ *
+ * @since 3.1
+ */
+public class Spinner : Composite {
+ static final int INNER_BORDER = 2;
+ static final int MIN_ARROW_WIDTH = 6;
+ int lastEventTime = 0;
+ GdkEventKey* gdkEventKey;
+ int fixStart = -1, fixEnd = -1;
+
+/**
+ * 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#READ_ONLY
+ * @see SWT#WRAP
+ * @see Widget#checkSubclass
+ * @see Widget#getStyle
+ */
+public this (Composite parent, int style) {
+ super (parent, checkStyle (style));
+}
+
+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the receiver's text is modified, by sending
+ * it one of the messages defined in the ModifyListener
+ * interface.
+ *
+ * @param listener the listener which should 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 ModifyListener
+ * @see #removeModifyListener
+ */
+public void addModifyListener (ModifyListener listener) {
+ checkWidget ();
+ if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+ TypedListener typedListener = new TypedListener (listener);
+ addListener (SWT.Modify, typedListener);
+}
+
+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the control is selected by the user, by sending
+ * it one of the messages defined in the SelectionListener
+ * interface.
+ *
+ * widgetSelected
is not called for texts.
+ * widgetDefaultSelected
is typically called when ENTER is pressed in a single-line text.
+ *
+ *
+ * @param listener the listener which should be notified when the control is selected by the user
+ *
+ * @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 is null) error (SWT.ERROR_NULL_ARGUMENT);
+ TypedListener typedListener = new TypedListener(listener);
+ addListener(SWT.Selection,typedListener);
+ addListener(SWT.DefaultSelection,typedListener);
+}
+
+/**
+ * Adds the listener to the collection of listeners who will
+ * be notified when the receiver's text is verified, by sending
+ * it one of the messages defined in the VerifyListener
+ * interface.
+ *
+ * @param listener the listener which should 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 VerifyListener
+ * @see #removeVerifyListener
+ */
+void addVerifyListener (VerifyListener listener) {
+ checkWidget();
+ if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+ TypedListener typedListener = new TypedListener (listener);
+ addListener (SWT.Verify, typedListener);
+}
+
+static int checkStyle (int style) {
+ /*
+ * Even though it is legal to create this widget
+ * with scroll bars, they serve no useful purpose
+ * because they do not automatically scroll the
+ * widget's client area. The fix is to clear
+ * the SWT style.
+ */
+ return style & ~(SWT.H_SCROLL | SWT.V_SCROLL);
+}
+
+protected void checkSubclass () {
+ if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
+}
+
+public Point computeSize (int wHint, int hHint, bool changed) {
+ checkWidget ();
+ if (wHint !is SWT.DEFAULT && wHint < 0) wHint = 0;
+ if (hHint !is SWT.DEFAULT && hHint < 0) hHint = 0;
+ int w, h;
+ OS.gtk_widget_realize (handle);
+ auto layout = OS.gtk_entry_get_layout (cast(GtkEntry*)handle);
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) adjustment.upper *= 10;
+ char[] string = to!(char[])( (cast(int) adjustment.upper) );
+ if (digits > 0) {
+ //PROTING_TODO: Efficiency
+ char[] buffer = string ~ getDecimalSeparator ();
+ int count = digits - string.length;
+ while (count >= 0) {
+ buffer ~= "0";
+ count--;
+ }
+ string = buffer;
+ }
+ char [] buffer1 = string;
+ auto ptr = OS.pango_layout_get_text (layout);
+ char[] buffer2 = fromUtf8z( ptr ).dup;
+ OS.pango_layout_set_text (layout, buffer1.ptr, buffer1.length);
+ OS.pango_layout_get_size (layout, &w, &h);
+ OS.pango_layout_set_text (layout, buffer2.ptr, buffer2.length);
+ int width = OS.PANGO_PIXELS (w);
+ int height = OS.PANGO_PIXELS (h);
+ width = wHint is SWT.DEFAULT ? width : wHint;
+ height = hHint is SWT.DEFAULT ? height : hHint;
+ Rectangle trim = computeTrim (0, 0, width, height);
+ return new Point (trim.width, trim.height);
+}
+
+override public Rectangle computeTrim (int x, int y, int width, int height) {
+ checkWidget ();
+ int xborder = 0, yborder = 0;
+ auto style = OS.gtk_widget_get_style (handle);
+ if ((this.style & SWT.BORDER) !is 0) {
+ xborder += OS.gtk_style_get_xthickness (style);
+ yborder += OS.gtk_style_get_ythickness (style);
+ }
+ xborder += INNER_BORDER;
+ yborder += INNER_BORDER;
+ int property;
+ OS.gtk_widget_style_get1 (handle, OS.interior_focus.ptr, &property);
+ if (property is 0) {
+ OS.gtk_widget_style_get1 (handle, OS.focus_line_width.ptr, &property);
+ xborder += property;
+ yborder += property;
+ }
+ auto fontDesc = OS.gtk_style_get_font_desc (style);
+ int fontSize = OS.pango_font_description_get_size (fontDesc);
+ int arrowSize = Math.max (OS.PANGO_PIXELS (fontSize), MIN_ARROW_WIDTH);
+ arrowSize = arrowSize - arrowSize % 2;
+ Rectangle trim = super.computeTrim (x, y, width, height);
+ trim.x -= xborder;
+ trim.y -= yborder;
+ trim.width += 2 * xborder;
+ trim.height += 2 * yborder;
+ trim.width += arrowSize + (2 * OS.gtk_style_get_xthickness (style));
+ return new Rectangle (trim.x, trim.y, trim.width, trim.height);
+}
+
+/**
+ * Copies the selected text.
+ *
+ * The current selection is copied to the clipboard.
+ *
+ *
+ * @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 copy () {
+ checkWidget ();
+ OS.gtk_editable_copy_clipboard (cast(GtkEditable*)handle);
+}
+
+override void createHandle (int index) {
+ state |= HANDLE | MENU;
+ fixedHandle = cast(GtkWidget*)OS.g_object_new (display.gtk_fixed_get_type (), null);
+ if (fixedHandle is null) error (SWT.ERROR_NO_HANDLES);
+ OS.gtk_fixed_set_has_window (cast(GtkFixed*)fixedHandle, true);
+ auto adjustment = OS.gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+ if (adjustment is null) error (SWT.ERROR_NO_HANDLES);
+ handle = cast(GtkWidget*)OS.gtk_spin_button_new (cast(GtkAdjustment*)adjustment, 1, 0);
+ if (handle is null) error (SWT.ERROR_NO_HANDLES);
+ OS.gtk_container_add (cast(GtkContainer*)fixedHandle, handle);
+ OS.gtk_editable_set_editable (cast(GtkEditable*)handle, (style & SWT.READ_ONLY) is 0);
+ OS.gtk_entry_set_has_frame (cast(GtkEntry*)handle, (style & SWT.BORDER) !is 0);
+ OS.gtk_spin_button_set_wrap (cast(GtkSpinButton*)handle, (style & SWT.WRAP) !is 0);
+}
+
+/**
+ * Cuts the selected text.
+ *
+ * The current selection is first copied to the
+ * clipboard and then deleted from the widget.
+ *
+ *
+ * @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 cut () {
+ checkWidget ();
+ OS.gtk_editable_cut_clipboard (cast(GtkEditable*)handle);
+}
+
+override void deregister () {
+ super.deregister ();
+ auto imContext = imContext ();
+ if (imContext !is null) display.removeWidget (cast(GtkWidget*)imContext);
+}
+
+GdkDrawable* eventWindow () {
+ return paintWindow ();
+}
+
+GtkWidget* enterExitHandle () {
+ return fixedHandle;
+}
+
+override bool filterKey (int keyval, GdkEventKey* event) {
+ int time = OS.gdk_event_get_time (cast(GdkEvent*)event);
+ if (time !is lastEventTime) {
+ lastEventTime = time;
+ auto imContext = imContext ();
+ if (imContext !is null) {
+ return cast(bool)OS.gtk_im_context_filter_keypress (imContext, event);
+ }
+ }
+ gdkEventKey = event;
+ return false;
+}
+
+void fixIM () {
+ /*
+ * The IM filter has to be called one time for each key press event.
+ * When the IM is open the key events are duplicated. The first event
+ * is filtered by SWT and the second event is filtered by GTK. In some
+ * cases the GTK handler does not run (the widget is destroyed, the
+ * application code consumes the event, etc), for these cases the IM
+ * filter has to be called by SWT.
+ */
+ if (gdkEventKey !is null && gdkEventKey !is cast(GdkEventKey*)-1) {
+ auto imContext = imContext ();
+ if (imContext !is null) {
+ OS.gtk_im_context_filter_keypress (imContext, gdkEventKey);
+ gdkEventKey = cast(GdkEventKey*)-1;
+ return;
+ }
+ }
+ gdkEventKey = null;
+}
+
+GdkColor* getBackgroundColor () {
+ return getBaseColor ();
+}
+
+public int getBorderWidth () {
+ checkWidget();
+ auto style = OS.gtk_widget_get_style (handle);
+ if ((this.style & SWT.BORDER) !is 0) {
+ return OS.gtk_style_get_xthickness (style);
+ }
+ return 0;
+}
+
+GdkColor* getForegroundColor () {
+ return getTextColor ();
+}
+
+/**
+ * Returns the amount that the receiver's value will be
+ * modified by when the up/down 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 ();
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) adjustment.step_increment *= 10;
+ return cast(int) (adjustment.step_increment + 0.5);
+}
+
+/**
+ * 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 ();
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) adjustment.upper *= 10;
+ return cast(int) (adjustment.upper + 0.5);
+}
+
+/**
+ * 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 ();
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) adjustment.lower *= 10;
+ return cast(int) (adjustment.lower + 0.5);
+}
+
+/**
+ * Returns the amount that the receiver's position will be
+ * modified by when the page up/down keys are pressed.
+ *
+ * @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 ();
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) adjustment.page_increment *= 10;
+ return cast(int) (adjustment.page_increment + 0.5);
+}
+
+/**
+ * Returns the selection, which is the receiver's position.
+ *
+ * @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 ();
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) adjustment.value *= 10;
+ return cast(int) (adjustment.value + 0.5);
+}
+
+/**
+ * Returns the number of decimal places used by the receiver.
+ *
+ * @return the digits
+ *
+ * @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 getDigits () {
+ checkWidget ();
+ return OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+}
+
+char[] getDecimalSeparator () {
+ auto ptr = OS.localeconv_decimal_point ();
+ return fromUtf8z( ptr ).dup;
+}
+
+override int /*long*/ gtk_activate (GtkWidget* widget) {
+ postEvent (SWT.DefaultSelection);
+ return 0;
+}
+
+override int /*long*/ gtk_changed (GtkWidget* widget) {
+ auto str = OS.gtk_entry_get_text (cast(GtkEntry*)handle);
+ int length = tango.stdc.string.strlen (str);
+ if (length > 0) {
+ char* endptr;
+ double value = OS.g_strtod (str, &endptr);
+ if (endptr is str + length) {
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ if (value !is adjustment.value && adjustment.lower <= value && value <= adjustment.upper) {
+ OS.gtk_spin_button_update (cast(GtkSpinButton*)handle);
+ }
+ }
+ }
+
+ /*
+ * Feature in GTK. When the user types, GTK positions
+ * the caret after sending the changed signal. This
+ * means that application code that attempts to position
+ * the caret during a changed signal will fail. The fix
+ * is to post the modify event when the user is typing.
+ */
+ bool keyPress = false;
+ auto eventPtr = OS.gtk_get_current_event ();
+ if (eventPtr !is null) {
+ GdkEventKey* gdkEvent = cast(GdkEventKey*)eventPtr;
+ switch (gdkEvent.type) {
+ case OS.GDK_KEY_PRESS:
+ keyPress = true;
+ break;
+ default:
+ }
+ OS.gdk_event_free (eventPtr);
+ }
+ if (keyPress) {
+ postEvent (SWT.Modify);
+ } else {
+ sendEvent (SWT.Modify);
+ }
+ return 0;
+}
+
+int /*long*/ gtk_commit (GtkIMContext* imContext, char* text) {
+ if (text is null) return 0;
+ if (!OS.gtk_editable_get_editable (cast(GtkEditable*)handle)) return 0;
+ char [] chars = fromUtf8z( text ).dup;
+ if (chars.length is 0) return 0;
+ char [] newChars = sendIMKeyEvent (SWT.KeyDown, null, chars);
+ if (newChars is null) return 0;
+ /*
+ * Feature in GTK. For a GtkEntry, during the insert-text signal,
+ * GTK allows the programmer to change only the caret location,
+ * not the selection. If the programmer changes the selection,
+ * the new selection is lost. The fix is to detect a selection
+ * change and set it after the insert-text signal has completed.
+ */
+ fixStart = fixEnd = -1;
+ OS.g_signal_handlers_block_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)COMMIT);
+ int id = OS.g_signal_lookup (OS.commit.ptr, OS.gtk_im_context_get_type ());
+ int mask = OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
+ OS.g_signal_handlers_unblock_matched (imContext, mask, id, 0, null, null, cast(void*)handle);
+ if (newChars is chars) {
+ OS.g_signal_emit_by_name1 (imContext, OS.commit.ptr, cast(int)text);
+ } else {
+ OS.g_signal_emit_by_name1 (imContext, OS.commit.ptr, cast(int)toStringz(newChars));
+ }
+ OS.g_signal_handlers_unblock_matched (imContext, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)COMMIT);
+ OS.g_signal_handlers_block_matched (imContext, mask, id, 0, null, null, cast(void*)handle);
+ if (fixStart !is -1 && fixEnd !is -1) {
+ OS.gtk_editable_set_position (cast(GtkEditable*)handle, fixStart);
+ OS.gtk_editable_select_region (cast(GtkEditable*)handle, fixStart, fixEnd);
+ }
+ fixStart = fixEnd = -1;
+ return 0;
+}
+
+override int /*long*/ gtk_delete_text (GtkWidget* widget, int start_pos, int end_pos) {
+ if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+ char[] newText = verifyText ("", cast(int)/*64*/start_pos, cast(int)/*64*/end_pos);
+ if (newText is null) {
+ OS.g_signal_stop_emission_by_name (handle, OS.delete_text.ptr);
+ } else {
+ if (newText.length > 0) {
+ int pos;
+ pos = cast(int)/*64*/end_pos;
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)CHANGED);
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)INSERT_TEXT);
+ OS.gtk_editable_insert_text (cast(GtkEditable*)handle, newText.ptr, newText.length, &pos);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)INSERT_TEXT);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)CHANGED);
+ OS.gtk_editable_set_position (cast(GtkEditable*)handle, pos);
+ }
+ }
+ return 0;
+}
+
+override int /*long*/ gtk_event_after (GtkWidget* widget, GdkEvent* gdkEvent) {
+ if (cursor !is null) setCursor (cursor.handle);
+ return super.gtk_event_after (widget, gdkEvent);
+}
+
+override int /*long*/ gtk_focus_out_event (GtkWidget* widget, GdkEventFocus* event) {
+ fixIM ();
+ return super.gtk_focus_out_event (widget, event);
+}
+
+override int /*long*/ gtk_insert_text (GtkEditable* widget, char* new_text, int new_text_length, int position) {
+// if (!hooks (SWT.Verify) && !filters (SWT.Verify)) return 0;
+ if (new_text is null || new_text_length is 0) return 0;
+ char[] oldText = new_text[ 0 .. new_text_length ].dup;
+ int pos;
+ pos = position;
+ if (pos is -1) {
+ auto ptr = OS.gtk_entry_get_text (cast(GtkEntry*)handle);
+ pos = cast(int)/*64*/OS.g_utf8_strlen (ptr, -1);
+ }
+ char[] newText = verifyText (oldText, pos, pos);
+ if (newText !is oldText) {
+ int newStart, newEnd;
+ OS.gtk_editable_get_selection_bounds (cast(GtkEditable*)handle, &newStart, &newEnd);
+ if (newText !is null) {
+ if (newStart !is newEnd) {
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)DELETE_TEXT);
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)CHANGED);
+ OS.gtk_editable_delete_selection (cast(GtkEditable*)handle);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)DELETE_TEXT);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)CHANGED);
+ }
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)INSERT_TEXT);
+ OS.gtk_editable_insert_text (cast(GtkEditable*)handle, newText.ptr, newText.length, &pos);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)INSERT_TEXT);
+ newStart = newEnd = pos;
+ }
+ pos = newEnd;
+ if (newStart !is newEnd ) {
+ fixStart = newStart ;
+ fixEnd = newEnd ;
+ }
+ position = pos;
+ OS.g_signal_stop_emission_by_name (handle, OS.insert_text.ptr);
+ }
+ return 0;
+}
+
+override int /*long*/ gtk_key_press_event (GtkWidget* widget, GdkEventKey* event) {
+ auto result = super.gtk_key_press_event (widget, event);
+ if (result !is 0) fixIM ();
+ if (gdkEventKey is cast(GdkEventKey*)-1) result = 1;
+ gdkEventKey = null;
+ return result;
+}
+
+override int /*long*/ gtk_value_changed (int adjustment) {
+ postEvent (SWT.Selection);
+ return 0;
+}
+
+override void hookEvents () {
+ super.hookEvents();
+ OS.g_signal_connect_closure (handle, OS.changed.ptr, display.closures [CHANGED], true);
+ OS.g_signal_connect_closure (handle, OS.insert_text.ptr, display.closures [INSERT_TEXT], false);
+ OS.g_signal_connect_closure (handle, OS.delete_text.ptr, display.closures [DELETE_TEXT], false);
+ OS.g_signal_connect_closure (handle, OS.value_changed.ptr, display.closures [VALUE_CHANGED], false);
+ OS.g_signal_connect_closure (handle, OS.activate.ptr, display.closures [ACTIVATE], false);
+ auto imContext = imContext ();
+ if (imContext !is null) {
+ OS.g_signal_connect_closure (imContext, OS.commit.ptr, display.closures [COMMIT], false);
+ int id = OS.g_signal_lookup (OS.commit.ptr, OS.gtk_im_context_get_type ());
+ int mask = OS.G_SIGNAL_MATCH_DATA | OS.G_SIGNAL_MATCH_ID;
+ OS.g_signal_handlers_block_matched (imContext, mask, id, 0, null, null, cast(void*)handle);
+ }
+}
+
+GtkIMContext* imContext () {
+ return OS.GTK_ENTRY_IM_CONTEXT (cast(GtkEntry*)handle);
+}
+
+GdkDrawable* paintWindow () {
+ auto window = super.paintWindow ();
+ auto children = OS.gdk_window_get_children (window);
+ if (children !is null) window = cast(GdkDrawable*)OS.g_list_data (children);
+ OS.g_list_free (children);
+ return window;
+}
+
+/**
+ * Pastes text from clipboard.
+ *
+ * The selected text is deleted from the widget
+ * and new text inserted from the clipboard.
+ *
+ *
+ * @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 paste () {
+ checkWidget ();
+ OS.gtk_editable_paste_clipboard (cast(GtkEditable*)handle);
+}
+
+void register () {
+ super.register ();
+ auto imContext = imContext ();
+ if (imContext !is null) display.addWidget (cast(GtkWidget*)imContext, this);
+}
+
+void releaseWidget () {
+ super.releaseWidget ();
+ fixIM ();
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the receiver's text is modified.
+ *
+ * @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 ModifyListener
+ * @see #addModifyListener
+ */
+public void removeModifyListener (ModifyListener listener) {
+ checkWidget ();
+ if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (eventTable is null) return;
+ eventTable.unhook (SWT.Modify, listener);
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the control is selected by the user.
+ *
+ * @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 is null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (eventTable is null) return;
+ eventTable.unhook(SWT.Selection, listener);
+ eventTable.unhook(SWT.DefaultSelection,listener);
+}
+
+/**
+ * Removes the listener from the collection of listeners who will
+ * be notified when the control is verified.
+ *
+ * @param listener the listener which should 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 VerifyListener
+ * @see #addVerifyListener
+ */
+void removeVerifyListener (VerifyListener listener) {
+ checkWidget ();
+ if (listener is null) error (SWT.ERROR_NULL_ARGUMENT);
+ if (eventTable is null) return;
+ eventTable.unhook (SWT.Verify, listener);
+}
+
+void setBackgroundColor (GdkColor* color) {
+ super.setBackgroundColor (color);
+ OS.gtk_widget_modify_base (handle, 0, color);
+}
+
+void setCursor (GdkCursor* cursor) {
+ GdkCursor* defaultCursor;
+ if (cursor is null) defaultCursor = OS.gdk_cursor_new (OS.GDK_XTERM);
+ super.setCursor (cursor !is null ? cursor : defaultCursor);
+ if (cursor is null) OS.gdk_cursor_destroy (defaultCursor);
+}
+
+void setFontDescription (PangoFontDescription* font) {
+ super.setFontDescription (font);
+}
+
+/**
+ * Sets the amount that the receiver's value will be
+ * modified by when the up/down 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;
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ double newValue = value;
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) newValue /= 10;
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+ OS.gtk_spin_button_set_increments (cast(GtkSpinButton*)handle, newValue, adjustment.page_increment);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+}
+
+/**
+ * Sets the maximum value that the receiver will allow. This new
+ * value will be ignored if it is not greater than the receiver's current
+ * minimum value. If the new maximum is applied then the receiver's
+ * selection value will be adjusted if necessary to fall within its new range.
+ *
+ * @param value the new maximum, which must be greater than the current 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 setMaximum (int value) {
+ checkWidget ();
+ if (value < 0) return;
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ double newValue = value;
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) newValue /= 10;
+ if (newValue <= adjustment.lower) return;
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+ OS.gtk_spin_button_set_range (cast(GtkSpinButton*)handle, adjustment.lower, newValue);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+}
+
+/**
+ * Sets the minimum value that the receiver will allow. This new
+ * value will be ignored if it is negative or is not less than the receiver's
+ * current maximum value. If the new minimum is applied then the receiver's
+ * selection value will be adjusted if necessary to fall within its new range.
+ *
+ * @param value the new minimum, which must be nonnegative and less than the current 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 setMinimum (int value) {
+ checkWidget ();
+ if (value < 0) return;
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ double newValue = value;
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) newValue /= 10;
+ if (newValue >= adjustment.upper) return;
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+ OS.gtk_spin_button_set_range (cast(GtkSpinButton*)handle, newValue, adjustment.upper);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+}
+
+/**
+ * Sets the amount that the receiver's position will be
+ * modified by when the page up/down keys are pressed
+ * 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;
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ double newValue = value;
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) newValue /= 10;
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+ OS.gtk_spin_button_set_increments (cast(GtkSpinButton*)handle, adjustment.step_increment, newValue);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+}
+
+/**
+ * Sets the selection, which is the receiver's
+ * position, to the argument. If the argument is not within
+ * the range specified by minimum and maximum, it will be
+ * adjusted to fall within this range.
+ *
+ * @param value 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 ();
+ double newValue = value;
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ for (int i = 0; i < digits; i++) newValue /= 10;
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+ OS.gtk_spin_button_set_value (cast(GtkSpinButton*)handle, newValue);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+}
+
+/**
+ * Sets the number of decimal places used by the receiver.
+ *
+ * The digit setting is used to allow for floating point values in the receiver.
+ * For example, to set the selection to a floating point value of 1.37 call setDigits() with
+ * a value of 2 and setSelection() with a value of 137. Similarly, if getDigits() has a value
+ * of 2 and getSelection() returns 137 this should be interpreted as 1.37. This applies to all
+ * numeric APIs.
+ *
+ *
+ * @param value the new digits (must be greater than or equal to zero)
+ *
+ * @exception IllegalArgumentException
+ * - ERROR_INVALID_ARGUMENT - if the value is less 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 setDigits (int value) {
+ checkWidget ();
+ if (value < 0) error (SWT.ERROR_INVALID_ARGUMENT);
+ int digits = OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle);
+ if (value is digits) return;
+ auto adjustment = OS.gtk_spin_button_get_adjustment (cast(GtkSpinButton*)handle);
+ int diff = Math.abs (value - digits);
+ int factor = 1;
+ for (int i = 0; i < diff; i++) factor *= 10;
+ if (digits > value) {
+ adjustment.value *= factor;
+ adjustment.upper *= factor;
+ adjustment.lower *= factor;
+ adjustment.step_increment *= factor;
+ adjustment.page_increment *= factor;
+ } else {
+ adjustment.value /= factor;
+ adjustment.upper /= factor;
+ adjustment.lower /= factor;
+ adjustment.step_increment /= factor;
+ adjustment.page_increment /= factor;
+ }
+ OS.gtk_spin_button_set_digits (cast(GtkSpinButton*)handle, value);
+}
+
+/**
+ * Sets the receiver's selection, minimum value, maximum
+ * value, digits, 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 digits the new digits 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
+ *
+ *
+ * @since 3.2
+ */
+public void setValues (int selection, int minimum, int maximum, int digits, int increment, int pageIncrement) {
+ checkWidget ();
+ if (minimum < 0) return;
+ if (maximum <= minimum) return;
+ if (digits < 0) return;
+ if (increment < 1) return;
+ if (pageIncrement < 1) return;
+ selection = Math.min (Math.max (minimum, selection), maximum);
+ double factor = 1;
+ for (int i = 0; i < digits; i++) factor *= 10;
+ OS.g_signal_handlers_block_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+ OS.gtk_spin_button_set_range (cast(GtkSpinButton*)handle, minimum / factor, maximum / factor);
+ OS.gtk_spin_button_set_increments (cast(GtkSpinButton*)handle, increment / factor, pageIncrement / factor);
+ OS.gtk_spin_button_set_value (cast(GtkSpinButton*)handle, selection / factor);
+ OS.gtk_spin_button_set_digits (cast(GtkSpinButton*)handle, digits);
+ OS.g_signal_handlers_unblock_matched (handle, OS.G_SIGNAL_MATCH_DATA, 0, 0, null, null, cast(void*)VALUE_CHANGED);
+}
+
+bool translateTraversal (GdkEventKey* keyEvent) {
+ int key = keyEvent.keyval;
+ switch (key) {
+ case OS.GDK_KP_Enter:
+ case OS.GDK_Return: {
+ auto imContext = imContext ();
+ if (imContext !is null) {
+ char* preeditString;
+ OS.gtk_im_context_get_preedit_string (imContext, &preeditString, null, null);
+ if (preeditString !is null) {
+ int length = tango.stdc.string.strlen (preeditString);
+ OS.g_free (preeditString);
+ if (length !is 0) return false;
+ }
+ }
+ default:
+ }
+ }
+ return super.translateTraversal (keyEvent);
+}
+
+char[] verifyText (char[] string, int start, int end) {
+ if (string.length is 0 && start is end) return null;
+ Event event = new Event ();
+ event.text = string;
+ event.start = start;
+ event.end = end;
+ auto eventPtr = OS.gtk_get_current_event ();
+ if (eventPtr !is null) {
+ GdkEventKey* gdkEvent = cast(GdkEventKey*)eventPtr;
+ switch (gdkEvent.type) {
+ case OS.GDK_KEY_PRESS:
+ setKeyState (event, gdkEvent);
+ break;
+ default:
+ }
+ OS.gdk_event_free (eventPtr);
+ }
+ int index = 0;
+ if (OS.gtk_spin_button_get_digits (cast(GtkSpinButton*)handle) > 0) {
+ char[] decimalSeparator = getDecimalSeparator ();
+ index = tango.text.Util.locatePattern( string, decimalSeparator );
+ if (index !is string.length) {
+ string = string[ 0 .. index ] ~ string[ index + 1 ];
+ }
+ index = 0;
+ }
+ while (index < string.length) {
+ if (!Unicode.isDigit (string[index])) break;
+ index++;
+ }
+ event.doit = index is string.length;
+ /*
+ * It is possible (but unlikely), that application
+ * code could have disposed the widget in the verify
+ * event. If this happens, answer null to cancel
+ * the operation.
+ */
+ sendEvent (SWT.Verify, event);
+ if (!event.doit || isDisposed ()) return null;
+ return event.text;
+}
+
+}
diff -r a4880dcb4139 -r f30b84b656a5 todo.txt
--- a/todo.txt Sat Jan 12 13:39:54 2008 +0100
+++ b/todo.txt Sat Jan 12 14:50:03 2008 +0100
@@ -122,7 +122,7 @@
widgets/ScrollBar // OKs
widgets/Shell // OKs
widgets/Slider // OKs
-widgets/Spinner
+widgets/Spinner // OSs
widgets/Synchronizer // OKs
widgets/TabFolder
widgets/TabItem