summaryrefslogtreecommitdiff
path: root/iup/src/mot
diff options
context:
space:
mode:
Diffstat (limited to 'iup/src/mot')
-rwxr-xr-xiup/src/mot/iupmot_button.c44
-rwxr-xr-xiup/src/mot/iupmot_canvas.c48
-rwxr-xr-xiup/src/mot/iupmot_common.c19
-rwxr-xr-xiup/src/mot/iupmot_dialog.c62
-rw-r--r--iup/src/mot/iupmot_draw.c188
-rwxr-xr-xiup/src/mot/iupmot_drv.h2
-rwxr-xr-xiup/src/mot/iupmot_filedlg.c104
-rwxr-xr-xiup/src/mot/iupmot_font.c14
-rwxr-xr-xiup/src/mot/iupmot_frame.c58
-rwxr-xr-xiup/src/mot/iupmot_key.c20
-rwxr-xr-xiup/src/mot/iupmot_label.c40
-rwxr-xr-xiup/src/mot/iupmot_list.c105
-rwxr-xr-xiup/src/mot/iupmot_loop.c15
-rwxr-xr-xiup/src/mot/iupmot_menu.c26
-rwxr-xr-xiup/src/mot/iupmot_progressbar.c30
-rwxr-xr-xiup/src/mot/iupmot_tabs.c73
-rwxr-xr-xiup/src/mot/iupmot_text.c108
-rwxr-xr-xiup/src/mot/iupmot_toggle.c72
-rwxr-xr-xiup/src/mot/iupmot_tree.c1636
-rwxr-xr-xiup/src/mot/iupmot_val.c42
-rwxr-xr-xiup/src/mot/iupunix_info.c2
21 files changed, 1447 insertions, 1261 deletions
diff --git a/iup/src/mot/iupmot_button.c b/iup/src/mot/iupmot_button.c
index 2d93588..f6e383f 100755
--- a/iup/src/mot/iupmot_button.c
+++ b/iup/src/mot/iupmot_button.c
@@ -112,8 +112,10 @@ static int motButtonSetPaddingAttrib(Ihandle* ih, const char* value)
{
XtVaSetValues(ih->handle, XmNmarginHeight, ih->data->vert_padding,
XmNmarginWidth, ih->data->horiz_padding, NULL);
+ return 0;
}
- return 0;
+ else
+ return 1; /* store until not mapped, when mapped will be set again */
}
static int motButtonSetBgColorAttrib(Ihandle* ih, const char* value)
@@ -189,43 +191,43 @@ static int motButtonMapMethod(Ihandle* ih)
if (value)
{
ih->data->type = IUP_BUTTON_IMAGE;
- iupmotSetArg(args, num_args, XmNlabelType, XmPIXMAP);
+ iupMOT_SETARG(args, num_args, XmNlabelType, XmPIXMAP);
}
else
{
ih->data->type = IUP_BUTTON_TEXT;
- iupmotSetArg(args, num_args, XmNlabelType, XmSTRING);
+ iupMOT_SETARG(args, num_args, XmNlabelType, XmSTRING);
}
/* Core */
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
/* Label */
- iupmotSetArg(args, num_args, XmNrecomputeSize, False); /* no automatic resize from text */
- iupmotSetArg(args, num_args, XmNmarginHeight, 0); /* default padding */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
- iupmotSetArg(args, num_args, XmNmarginTop, 0); /* no extra margins */
- iupmotSetArg(args, num_args, XmNmarginLeft, 0);
- iupmotSetArg(args, num_args, XmNmarginBottom, 0);
- iupmotSetArg(args, num_args, XmNmarginRight, 0);
+ iupMOT_SETARG(args, num_args, XmNrecomputeSize, False); /* no automatic resize from text */
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0); /* default padding */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginTop, 0); /* no extra margins */
+ iupMOT_SETARG(args, num_args, XmNmarginLeft, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginBottom, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginRight, 0);
/* PushButton */
- iupmotSetArg(args, num_args, XmNfillOnArm, False);
+ iupMOT_SETARG(args, num_args, XmNfillOnArm, False);
/* Primitive */
if (iupAttribGetBoolean(ih, "FOCUSONCLICK"))
{
if (iupAttribGetBoolean(ih, "CANFOCUS"))
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
}
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 2);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
ih->handle = XtCreateManagedWidget(
iupDialogGetChildIdStr(ih), /* child identifier */
diff --git a/iup/src/mot/iupmot_canvas.c b/iup/src/mot/iupmot_canvas.c
index 7777cf3..299bbcd 100755
--- a/iup/src/mot/iupmot_canvas.c
+++ b/iup/src/mot/iupmot_canvas.c
@@ -434,6 +434,10 @@ static void motCanvasLayoutUpdateMethod(Ihandle *ih)
XtVaGetValues(sb_win, XmNborderWidth, &border, NULL);
+ /* avoid abort in X */
+ if (ih->currentwidth <= 2*border) ih->currentwidth = 2*border+1;
+ if (ih->currentheight <= 2*border) ih->currentheight = 2*border+1;
+
XtVaSetValues(sb_win,
XmNx, (XtArgVal)ih->x,
XmNy, (XtArgVal)ih->y,
@@ -458,19 +462,19 @@ static int motCanvasMapMethod(Ihandle* ih)
/* Create the scrolled window */
/******************************/
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNscrollingPolicy, XmAPPLICATION_DEFINED);
- iupmotSetArg(args, num_args, XmNvisualPolicy, XmVARIABLE);
- iupmotSetArg(args, num_args, XmNspacing, 0); /* no space between scrollbars and draw area */
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNscrollingPolicy, XmAPPLICATION_DEFINED);
+ iupMOT_SETARG(args, num_args, XmNvisualPolicy, XmVARIABLE);
+ iupMOT_SETARG(args, num_args, XmNspacing, 0); /* no space between scrollbars and draw area */
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
if (iupAttribGetBoolean(ih, "BORDER"))
{
- iupmotSetArg(args, num_args, XmNborderWidth, 1);
- iupmotSetArg(args, num_args, XmNborderColor, iupmotColorGetPixelStr("0 0 0"));
+ iupMOT_SETARG(args, num_args, XmNborderWidth, 1);
+ iupMOT_SETARG(args, num_args, XmNborderColor, iupmotColorGetPixelStr("0 0 0"));
}
else
- iupmotSetArg(args, num_args, XmNborderWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNborderWidth, 0);
sb_win = XtCreateManagedWidget(
iupDialogGetChildIdStr(ih), /* child identifier */
@@ -488,36 +492,36 @@ static int motCanvasMapMethod(Ihandle* ih)
/****************************/
num_args = 0;
- iupmotSetArg(args, num_args, XmNmarginHeight, 0); /* no shadow margins */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0); /* no shadow margins */
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
- iupmotSetArg(args, num_args, XmNresizePolicy, XmRESIZE_NONE); /* no automatic resize of children */
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0); /* no shadow margins */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0); /* no shadow margins */
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNresizePolicy, XmRESIZE_NONE); /* no automatic resize of children */
if (ih->iclass->is_interactive)
{
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP); /* include in navigation */
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP); /* include in navigation */
if (iupAttribGetBoolean(ih, "CANFOCUS"))
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
}
else
{
- iupmotSetArg(args, num_args, XmNnavigationType, XmNONE);
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmNONE);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
}
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
visual = IupGetAttribute(ih, "VISUAL"); /* defined by the OpenGL Canvas or NULL */
if (visual)
{
Colormap colormap = (Colormap)iupAttribGet(ih, "COLORMAP");
if (colormap)
- iupmotSetArg(args, num_args, XmNcolormap,colormap);
+ iupMOT_SETARG(args, num_args, XmNcolormap,colormap);
iupmotDialogSetVisual(ih, visual);
}
diff --git a/iup/src/mot/iupmot_common.c b/iup/src/mot/iupmot_common.c
index 7b3f8b7..286e075 100755
--- a/iup/src/mot/iupmot_common.c
+++ b/iup/src/mot/iupmot_common.c
@@ -167,6 +167,10 @@ void iupdrvBaseLayoutUpdateMethod(Ihandle *ih)
Widget widget = (Widget)iupAttribGet(ih, "_IUP_EXTRAPARENT");
if (!widget) widget = ih->handle;
+ /* avoid abort in X */
+ if (ih->currentwidth == 0) ih->currentwidth = 1;
+ if (ih->currentheight == 0) ih->currentheight = 1;
+
XtVaSetValues(widget,
XmNx, (XtArgVal)ih->x,
XmNy, (XtArgVal)ih->y,
@@ -184,7 +188,7 @@ void iupdrvBaseUnMapMethod(Ihandle* ih)
XtDestroyWidget(widget); /* To match the call to XtCreateManagedWidget */
}
-void iupdrvDisplayUpdate(Ihandle *ih)
+void iupdrvPostRedraw(Ihandle *ih)
{
XExposeEvent evt;
Dimension w, h;
@@ -209,12 +213,12 @@ void iupdrvDisplayUpdate(Ihandle *ih)
XSendEvent(iupmot_display, XtWindow(ih->handle), False, ExposureMask, (XEvent*)&evt);
}
-void iupdrvDisplayRedraw(Ihandle *ih)
+void iupdrvRedrawNow(Ihandle *ih)
{
Widget w;
/* POST a Redraw */
- iupdrvDisplayUpdate(ih);
+ iupdrvPostRedraw(ih);
/* if this element has an inner native parent (like IupTabs),
then redraw that native parent if different from the element. */
@@ -223,7 +227,7 @@ void iupdrvDisplayRedraw(Ihandle *ih)
{
Widget handle = ih->handle;
ih->handle = w;
- iupdrvDisplayUpdate(ih);
+ iupdrvPostRedraw(ih);
ih->handle = handle;
}
@@ -276,10 +280,11 @@ int iupdrvBaseSetZorderAttrib(Ihandle* ih, const char* value)
{
if (iupdrvIsVisible(ih))
{
+ Widget widget = (Widget)iupAttribGet(ih, "_IUP_EXTRAPARENT");
if (iupStrEqualNoCase(value, "TOP"))
- XRaiseWindow(iupmot_display, XtWindow(ih->handle));
+ XRaiseWindow(iupmot_display, XtWindow(widget));
else
- XLowerWindow(iupmot_display, XtWindow(ih->handle));
+ XLowerWindow(iupmot_display, XtWindow(widget));
}
return 0;
@@ -455,9 +460,11 @@ static Cursor motGetCursor(Ihandle* ih, const char* name)
{ "RESIZE_N", XC_top_side},
{ "RESIZE_S", XC_bottom_side},
{ "RESIZE_NS", XC_sb_v_double_arrow},
+ { "SPLITTER_HORIZ", XC_sb_v_double_arrow},
{ "RESIZE_W", XC_left_side},
{ "RESIZE_E", XC_right_side},
{ "RESIZE_WE", XC_sb_h_double_arrow},
+ { "SPLITTER_VERT", XC_sb_h_double_arrow},
{ "RESIZE_NE", XC_top_right_corner},
{ "RESIZE_SE", XC_bottom_right_corner},
{ "RESIZE_NW", XC_top_left_corner},
diff --git a/iup/src/mot/iupmot_dialog.c b/iup/src/mot/iupmot_dialog.c
index 4eeb834..7a27d74 100755
--- a/iup/src/mot/iupmot_dialog.c
+++ b/iup/src/mot/iupmot_dialog.c
@@ -134,12 +134,13 @@ void iupdrvDialogGetDecoration(Ihandle* ih, int *border, int *caption, int *menu
static int native_border = 0;
static int native_caption = 0;
- int has_caption = iupAttribGetBoolean(ih, "MAXBOX") ||
- iupAttribGetBoolean(ih, "MINBOX") ||
- iupAttribGetBoolean(ih, "MENUBOX") ||
- IupGetAttribute(ih, "TITLE"); /* must use IupGetAttribute to check from the native implementation */
+ int has_titlebar = iupAttribGetBoolean(ih, "RESIZE") || /* GTK and Motif only */
+ iupAttribGetBoolean(ih, "MAXBOX") ||
+ iupAttribGetBoolean(ih, "MINBOX") ||
+ iupAttribGetBoolean(ih, "MENUBOX") ||
+ IupGetAttribute(ih, "TITLE"); /* must use IupGetAttribute to check from the native implementation */
- int has_border = has_caption ||
+ int has_border = has_titlebar ||
iupAttribGetBoolean(ih, "RESIZE") ||
iupAttribGetBoolean(ih, "BORDER");
@@ -155,7 +156,7 @@ void iupdrvDialogGetDecoration(Ihandle* ih, int *border, int *caption, int *menu
*border = win_border;
*caption = 0;
- if (has_caption)
+ if (has_titlebar)
*caption = win_caption;
if (!native_border && *border)
@@ -181,7 +182,7 @@ void iupdrvDialogGetDecoration(Ihandle* ih, int *border, int *caption, int *menu
}
*caption = 0;
- if (has_caption)
+ if (has_titlebar)
{
if (native_caption)
*caption = native_caption;
@@ -853,6 +854,7 @@ static int motDialogMapMethod(Ihandle* ih)
InativeHandle* parent;
int mwm_decor = 0;
int num_args = 0;
+ int has_titlebar = 0;
Arg args[20];
if (iupAttribGetBoolean(ih, "DIALOGFRAME"))
@@ -867,32 +869,46 @@ static int motDialogMapMethod(Ihandle* ih)
/****************************/
if (iupAttribGet(ih, "TITLE"))
- mwm_decor |= MWM_DECOR_TITLE;
+ has_titlebar = 1;
if (iupAttribGetBoolean(ih, "MENUBOX"))
- mwm_decor |= MWM_DECOR_MENU;
+ {
+ mwm_decor |= MWM_DECOR_MENU;
+ has_titlebar = 1;
+ }
if (iupAttribGetBoolean(ih, "MINBOX"))
- mwm_decor |= MWM_DECOR_MINIMIZE;
+ {
+ mwm_decor |= MWM_DECOR_MINIMIZE;
+ has_titlebar = 1;
+ }
if (iupAttribGetBoolean(ih, "MAXBOX"))
- mwm_decor |= MWM_DECOR_MAXIMIZE;
+ {
+ mwm_decor |= MWM_DECOR_MAXIMIZE;
+ has_titlebar = 1;
+ }
if (iupAttribGetBoolean(ih, "RESIZE"))
- mwm_decor |= MWM_DECOR_RESIZEH;
- if (iupAttribGetBoolean(ih, "BORDER"))
- mwm_decor |= MWM_DECOR_BORDER;
-
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* so XtRealizeWidget will not show the dialog */
- iupmotSetArg(args, num_args, XmNdeleteResponse, XmDO_NOTHING);
- iupmotSetArg(args, num_args, XmNallowShellResize, True); /* Used so the BulletinBoard can control the shell size */
- iupmotSetArg(args, num_args, XmNtitle, "");
- iupmotSetArg(args, num_args, XmNvisual, iupmot_visual);
+ {
+ mwm_decor |= MWM_DECOR_RESIZEH;
+ mwm_decor |= MWM_DECOR_BORDER; /* has_border */
+ }
+ if (has_titlebar)
+ mwm_decor |= MWM_DECOR_TITLE;
+ if (iupAttribGetBoolean(ih, "BORDER") || has_titlebar)
+ mwm_decor |= MWM_DECOR_BORDER; /* has_border */
+
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* so XtRealizeWidget will not show the dialog */
+ iupMOT_SETARG(args, num_args, XmNdeleteResponse, XmDO_NOTHING);
+ iupMOT_SETARG(args, num_args, XmNallowShellResize, True); /* Used so the BulletinBoard can control the shell size */
+ iupMOT_SETARG(args, num_args, XmNtitle, "");
+ iupMOT_SETARG(args, num_args, XmNvisual, iupmot_visual);
if (iupmotColorMap())
- iupmotSetArg(args, num_args, XmNcolormap, iupmotColorMap());
+ iupMOT_SETARG(args, num_args, XmNcolormap, iupmotColorMap());
if (mwm_decor != 0x7E)
- iupmotSetArg(args, num_args, XmNmwmDecorations, mwm_decor);
+ iupMOT_SETARG(args, num_args, XmNmwmDecorations, mwm_decor);
if (iupAttribGetBoolean(ih, "SAVEUNDER"))
- iupmotSetArg(args, num_args, XmNsaveUnder, True);
+ iupMOT_SETARG(args, num_args, XmNsaveUnder, True);
parent = iupDialogGetNativeParent(ih);
if (parent)
diff --git a/iup/src/mot/iupmot_draw.c b/iup/src/mot/iupmot_draw.c
new file mode 100644
index 0000000..83a6d09
--- /dev/null
+++ b/iup/src/mot/iupmot_draw.c
@@ -0,0 +1,188 @@
+/** \file
+ * \brief Draw Functions
+ *
+ * See Copyright Notice in "iup.h"
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <memory.h>
+
+#include <Xm/Xm.h>
+#include <X11/Xlib.h>
+
+#include "iup.h"
+
+#include "iup_attrib.h"
+#include "iup_class.h"
+#include "iup_str.h"
+#include "iup_object.h"
+#include "iup_image.h"
+#include "iup_draw.h"
+
+#include "iupmot_drv.h"
+#include "iupmot_color.h"
+
+
+struct _IdrawCanvas{
+ Ihandle* ih;
+ int w, h;
+
+ Window wnd;
+ Pixmap pixmap;
+ GC pixmap_gc, gc;
+};
+
+static void motDrawGetGeometry(Display *dpy, Drawable wnd, int *_w, int *_h, int *_d)
+{
+ Window root;
+ int x, y;
+ unsigned int w, h, b, d;
+ XGetGeometry(dpy, wnd, &root, &x, &y, &w, &h, &b, &d);
+ *_w = w;
+ *_h = h;
+ *_d = d;
+}
+
+IdrawCanvas* iupDrawCreateCanvas(Ihandle* ih)
+{
+ IdrawCanvas* dc = calloc(1, sizeof(IdrawCanvas));
+ int depth;
+
+ dc->wnd = XtWindow(ih->handle);
+ dc->gc = XCreateGC(iupmot_display, dc->wnd, 0, NULL);
+
+ motDrawGetGeometry(iupmot_display, dc->wnd, &dc->w, &dc->h, &depth);
+
+ dc->pixmap = XCreatePixmap(iupmot_display, dc->wnd, dc->w, dc->h, depth);
+ dc->pixmap_gc = XCreateGC(iupmot_display, dc->pixmap, 0, NULL);
+
+ return dc;
+}
+
+void iupDrawKillCanvas(IdrawCanvas* dc)
+{
+ XFreeGC(iupmot_display, dc->pixmap_gc);
+ XFreePixmap(iupmot_display, dc->pixmap);
+ XFreeGC(iupmot_display, dc->gc);
+
+ free(dc);
+}
+
+void iupDrawUpdateSize(IdrawCanvas* dc)
+{
+ int w, h, depth;
+ motDrawGetGeometry(iupmot_display, dc->wnd, &w, &h, &depth);
+
+ if (w != dc->w || h != dc->h)
+ {
+ XFreeGC(iupmot_display, dc->pixmap_gc);
+ XFreePixmap(iupmot_display, dc->pixmap);
+
+ dc->pixmap = XCreatePixmap(iupmot_display, dc->wnd, dc->w, dc->h, depth);
+ dc->pixmap_gc = XCreateGC(iupmot_display, dc->pixmap, 0, NULL);
+ }
+}
+
+void iupDrawFlush(IdrawCanvas* dc)
+{
+ XCopyArea(iupmot_display, dc->pixmap, dc->wnd, dc->gc, 0, 0, dc->w, dc->h, 0, 0);
+}
+
+void iupDrawGetSize(IdrawCanvas* dc, int *w, int *h)
+{
+ if (w) *w = dc->w;
+ if (h) *h = dc->h;
+}
+
+void iupDrawParentBackground(IdrawCanvas* dc)
+{
+ unsigned char r=0, g=0, b=0;
+ char* color = iupBaseNativeParentGetBgColorAttrib(dc->ih);
+ iupStrToRGB(color, &r, &g, &b);
+ iupDrawRectangle(dc, 0, 0, dc->w-1, dc->h-1, r, g, b, 1);
+}
+
+void iupDrawRectangle(IdrawCanvas* dc, int x1, int y1, int x2, int y2, unsigned char r, unsigned char g, unsigned char b, int filled)
+{
+ XSetForeground(iupmot_display, dc->pixmap_gc, iupmotColorGetPixel(r, g, b));
+ if (filled)
+ XFillRectangle(iupmot_display, dc->pixmap, dc->pixmap_gc, x1, y1, x2-x1+1, y2-y1+1);
+ else
+ XDrawRectangle(iupmot_display, dc->pixmap, dc->pixmap_gc, x1, y1, x2-x1+1, y2-y1+1);
+}
+
+void iupDrawLine(IdrawCanvas* dc, int x1, int y1, int x2, int y2, unsigned char r, unsigned char g, unsigned char b)
+{
+ XSetForeground(iupmot_display, dc->pixmap_gc, iupmotColorGetPixel(r, g, b));
+ XDrawLine(iupmot_display, dc->pixmap, dc->pixmap_gc, x1, y1, x2, y2);
+}
+
+void iupDrawArc(IdrawCanvas* dc, int x1, int y1, int x2, int y2, double a1, double a2, unsigned char r, unsigned char g, unsigned char b, int filled)
+{
+ XSetForeground(iupmot_display, dc->pixmap_gc, iupmotColorGetPixel(r, g, b));
+ if (filled)
+ {
+ XSetArcMode(iupmot_display, dc->pixmap_gc, ArcPieSlice);
+ XFillArc(iupmot_display, dc->pixmap, dc->pixmap_gc, x1, y1, x2-x1+1, y2-y1+1, iupROUND(a1*64), iupROUND((a2 - a1)*64));
+ }
+ else
+ XDrawArc(iupmot_display, dc->pixmap, dc->pixmap_gc, x1, y1, x2-x1+1, y2-y1+1, iupROUND(a1*64), iupROUND((a2 - a1)*64));
+}
+
+void iupDrawPolygon(IdrawCanvas* dc, int* points, int count, unsigned char r, unsigned char g, unsigned char b, int filled)
+{
+ int i;
+ XPoint* pnt = (XPoint*)malloc(count*sizeof(XPoint)); /* XPoint uses short for coordinates */
+
+ for (i = 0; i < count; i++)
+ {
+ pnt[i].x = (short)points[2*i];
+ pnt[i].y = (short)points[2*i+1];
+ }
+
+ XSetForeground(iupmot_display, dc->pixmap_gc, iupmotColorGetPixel(r, g, b));
+ if (filled)
+ XFillPolygon(iupmot_display, dc->pixmap, dc->pixmap_gc, pnt, count, Complex, CoordModeOrigin);
+ else
+ XDrawLines(iupmot_display, dc->pixmap, dc->pixmap_gc, pnt, count, CoordModeOrigin);
+
+ free(pnt);
+}
+
+void iupDrawSetClipRect(IdrawCanvas* dc, int x1, int y1, int x2, int y2)
+{
+ XRectangle rect;
+ rect.x = (short)x1;
+ rect.y = (short)y1;
+ rect.width = (unsigned short)(x2-x1+1);
+ rect.height = (unsigned short)(y2-y1+1);
+ XSetClipRectangles(iupmot_display, dc->pixmap_gc, 0, 0, &rect, 1, Unsorted);
+}
+
+void iupDrawResetClip(IdrawCanvas* dc)
+{
+ XSetClipMask(iupmot_display, dc->pixmap_gc, None);
+}
+
+void iupDrawText(IdrawCanvas* dc, const char* text, int len, int x, int y, unsigned char r, unsigned char g, unsigned char b)
+{
+ XFontStruct* xfont = (XFontStruct*)IupGetAttribute(dc->ih, "XFONTSTRUCT");
+ XSetForeground(iupmot_display, dc->pixmap_gc, iupmotColorGetPixel(r, g, b));
+ XSetFont(iupmot_display, dc->pixmap_gc, xfont->fid);
+ XDrawString(iupmot_display, dc->pixmap, dc->pixmap_gc, x, y-xfont->ascent, text, len);
+}
+
+void iupDrawImage(IdrawCanvas* dc, const char* name, int make_inactive, int x, int y)
+{
+ int img_w, img_h, bpp;
+ Pixmap pixmap = (Pixmap)iupImageGetImage(name, dc->ih, make_inactive);
+ if (!pixmap)
+ return;
+
+ /* must use this info, since image can be a driver image loaded from resources */
+ iupdrvImageGetInfo((void*)pixmap, &img_w, &img_h, &bpp);
+
+ XCopyArea(iupmot_display, pixmap, dc->pixmap, dc->pixmap_gc, 0, 0, img_w, img_h, x, y);
+}
diff --git a/iup/src/mot/iupmot_drv.h b/iup/src/mot/iupmot_drv.h
index 8a536ef..424ae9f 100755
--- a/iup/src/mot/iupmot_drv.h
+++ b/iup/src/mot/iupmot_drv.h
@@ -65,7 +65,7 @@ void iupmotGetWindowSize(Ihandle *ih, int *width, int *height);
char* iupmotGetXWindowAttrib(Ihandle *ih);
-#define iupmotSetArg(_a, _i, _n, _d) ((_a)[(_i)].name = (_n), (_a)[(_i)].value = (XtArgVal)(_d), (_i)++)
+#define iupMOT_SETARG(_a, _i, _n, _d) ((_a)[(_i)].name = (_n), (_a)[(_i)].value = (XtArgVal)(_d), (_i)++)
#ifdef __cplusplus
diff --git a/iup/src/mot/iupmot_filedlg.c b/iup/src/mot/iupmot_filedlg.c
index 768dd2b..0be6319 100755
--- a/iup/src/mot/iupmot_filedlg.c
+++ b/iup/src/mot/iupmot_filedlg.c
@@ -17,6 +17,7 @@
#include <Xm/DrawingA.h>
#include <Xm/PushB.h>
#include <Xm/Frame.h>
+#include <Xm/List.h>
#include "iup.h"
#include "iupcbs.h"
@@ -28,6 +29,7 @@
#include "iup_dialog.h"
#include "iup_strmessage.h"
#include "iup_drvinfo.h"
+#include "iup_array.h"
#include "iupmot_drv.h"
@@ -87,14 +89,14 @@ static int motFileDlgCheckValue(Ihandle* ih, Widget w)
return 0;
}
}
- else
+ else if (!iupAttribGetBoolean(ih, "MULTIPLEFILES"))
{
if (iupdrvIsDirectory(value)) /* selected a directory */
{
iupStrMessageShowError(ih, "IUP_INVALIDDIR");
return 0;
}
- else if (!iupdrvIsFile(value)) /* new file */
+ else if (!iupdrvIsFile(value)) /* not a file == new file */
{
value = iupAttribGet(ih, "ALLOWNEW");
if (!value)
@@ -132,6 +134,51 @@ static void motFileDlgCBclose(Widget w, XtPointer client_data, XtPointer call_da
iupAttribSetStr(ih, "_IUP_WM_DELETE", "1");
}
+static int motFileDlgGetMultipleFiles(Ihandle* ih, const char* dir, Widget wList)
+{
+ int *pos, sel_count, dir_len;
+ int i, len, cur_len;
+ char *filename, *all_names;
+ Iarray* names_array;
+ XmString* items;
+
+ if (!XmListGetSelectedPos(wList, &pos, &sel_count))
+ return 0;
+
+ names_array = iupArrayCreate(1024, 1); /* just set an initial size, but count is 0 */
+ XtVaGetValues(wList, XmNitems, &items, NULL);
+
+ cur_len = strlen(dir);
+
+ all_names = iupArrayAdd(names_array, cur_len+1);
+ memcpy(all_names, dir, cur_len);
+ all_names[cur_len] = '|';
+ dir_len = cur_len;
+ cur_len++; /* skip separator */
+
+ for (i = 0; i<sel_count; i++)
+ {
+ filename = iupmotConvertString(items[pos[i]-1]); /* XmListGetSelectedPos starts at 1 */
+ len = strlen(filename)-dir_len;
+
+ cur_len = iupArrayCount(names_array);
+ all_names = iupArrayAdd(names_array, len+1);
+ memcpy(all_names+cur_len, filename+dir_len, len);
+ all_names[cur_len+len] = '|';
+ }
+
+ XtFree((char*)pos);
+
+ cur_len = iupArrayCount(names_array);
+ all_names = iupArrayInc(names_array);
+ all_names[cur_len+1] = 0;
+
+ iupAttribStoreStr(ih, "VALUE", all_names);
+
+ iupArrayDestroy(names_array);
+ return 1;
+}
+
static void motFileDlgCallback(Widget w, Ihandle* ih, XmFileSelectionBoxCallbackStruct* call_data)
{
(void)w;
@@ -151,14 +198,38 @@ static void motFileDlgCallback(Widget w, Ihandle* ih, XmFileSelectionBoxCallback
iupAttribSetStr(ih, "STATUS", "0");
iupAttribSetStr(ih, "FILEEXIST", NULL);
}
+ else if (iupAttribGetBoolean(ih, "MULTIPLEFILES"))
+ {
+ Widget wList = XmFileSelectionBoxGetChild(w, XmDIALOG_LIST);
+
+ /* VALUE obtained above contains exactly the DIRECTORY */
+ char* dir = iupAttribGet(ih, "VALUE");
+ int len = strlen(dir);
+ if (dir[len-1]=='/') dir[len-1] = 0; /* remove last '/' */
+ iupAttribStoreStr(ih, "DIRECTORY", dir);
+
+ if (!motFileDlgGetMultipleFiles(ih, iupAttribGet(ih, "DIRECTORY"), wList))
+ {
+ iupStrMessageShowError(ih, "IUP_FILENOTEXIST");
+ return;
+ }
+
+ iupAttribSetStr(ih, "STATUS", "0");
+ iupAttribSetStr(ih, "FILEEXIST", "YES");
+ }
else
{
IFnss file_cb = (IFnss)IupGetCallback(ih, "FILE_CB");
- if (file_cb && file_cb(ih, iupAttribGet(ih, "VALUE"), "OK") == IUP_IGNORE)
+ filename = iupAttribGet(ih, "VALUE");
+ if (file_cb && file_cb(ih, filename, "OK") == IUP_IGNORE)
return;
- if (iupdrvIsFile(iupAttribGet(ih, "VALUE"))) /* check if file exists */
+ if (iupdrvIsFile(filename)) /* check if file exists */
{
+ char* dir = iupStrFileGetPath(filename);
+ iupAttribStoreStr(ih, "DIRECTORY", dir);
+ free(dir);
+
iupAttribSetStr(ih, "FILEEXIST", "YES");
iupAttribSetStr(ih, "STATUS", "0");
}
@@ -188,9 +259,8 @@ static void motFileDlgCallback(Widget w, Ihandle* ih, XmFileSelectionBoxCallback
}
}
-static void motFileDlgHelpCallback(Widget w, XtPointer client_data, XtPointer call_data)
+static void motFileDlgHelpCallback(Widget w, Ihandle *ih, XtPointer call_data)
{
- Ihandle *ih = (Ihandle*)client_data;
Icallback cb = IupGetCallback(ih, "HELP_CB");
if (cb && cb(ih) == IUP_CLOSE)
{
@@ -340,14 +410,15 @@ static void motFileDlgPreviewCanvasExposeCallback(Widget w, Ihandle *ih, XtPoint
static void motFileDlgBrowseSelectionCallback(Widget w, Ihandle* ih, XmListCallbackStruct* list_data)
{
char* filename;
+ IFnss cb;
XmStringGetLtoR(list_data->item, XmSTRING_DEFAULT_CHARSET, &filename);
+ cb = (IFnss)IupGetCallback(ih, "FILE_CB");
if (iupdrvIsFile(filename))
- {
- IFnss cb = (IFnss)IupGetCallback(ih, "FILE_CB");
cb(ih, filename, "SELECT");
- }
+ else
+ cb(ih, filename, "OTHER");
XtFree(filename);
(void)w;
@@ -417,6 +488,13 @@ static int motFileDlgPopup(Ihandle* ih, int x, int y)
if (dialogtype == IUP_DIALOGDIR)
XtVaSetValues(filebox, XmNfileTypeMask, XmFILE_DIRECTORY, NULL);
+ if (iupAttribGetBoolean(ih, "MULTIPLEFILES"))
+ {
+ Widget wList = XmFileSelectionBoxGetChild(filebox, XmDIALOG_LIST);
+ XtVaSetValues(wList, XmNselectionPolicy, XmEXTENDED_SELECT, NULL);
+ XtAddCallback(wList, XmNextendedSelectionCallback, (XtCallbackProc)motFileDlgBrowseSelectionCallback, (XtPointer)ih);
+ }
+
/* just check for the path inside FILE */
value = iupAttribGet(ih, "FILE");
if (value && value[0] == '/')
@@ -501,8 +579,10 @@ static int motFileDlgPopup(Ihandle* ih, int x, int y)
file_cb = (IFnss)IupGetCallback(ih, "FILE_CB");
if (file_cb)
{
- Widget file_list = XmFileSelectionBoxGetChild(filebox, XmDIALOG_LIST);
- XtAddCallback(file_list, XmNbrowseSelectionCallback, (XtCallbackProc)motFileDlgBrowseSelectionCallback, (XtPointer)ih);
+ Widget list = XmFileSelectionBoxGetChild(filebox, XmDIALOG_LIST);
+ XtAddCallback(list, XmNbrowseSelectionCallback, (XtCallbackProc)motFileDlgBrowseSelectionCallback, (XtPointer)ih);
+ list = XmFileSelectionBoxGetChild(filebox, XmDIALOG_DIR_LIST);
+ XtAddCallback(list, XmNbrowseSelectionCallback, (XtCallbackProc)motFileDlgBrowseSelectionCallback, (XtPointer)ih);
if (iupAttribGetBoolean(ih, "SHOWPREVIEW"))
{
@@ -575,4 +655,6 @@ static int motFileDlgPopup(Ihandle* ih, int x, int y)
void iupdrvFileDlgInitClass(Iclass* ic)
{
ic->DlgPopup = motFileDlgPopup;
+
+ iupClassRegisterAttribute(ic, "MULTIPLEFILES", NULL, NULL, NULL, NULL, IUPAF_NO_INHERIT);
}
diff --git a/iup/src/mot/iupmot_font.c b/iup/src/mot/iupmot_font.c
index 8da06dd..42154b6 100755
--- a/iup/src/mot/iupmot_font.c
+++ b/iup/src/mot/iupmot_font.c
@@ -135,19 +135,19 @@ static XmFontList motFontCreateRenderTable(XFontStruct* fontstruct, int is_under
Arg args[10];
int num_args = 0;
- iupmotSetArg(args, num_args, XmNfontType, XmFONT_IS_FONT);
- iupmotSetArg(args, num_args, XmNfont, (XtPointer)fontstruct);
- iupmotSetArg(args, num_args, XmNloadModel, XmLOAD_IMMEDIATE);
+ iupMOT_SETARG(args, num_args, XmNfontType, XmFONT_IS_FONT);
+ iupMOT_SETARG(args, num_args, XmNfont, (XtPointer)fontstruct);
+ iupMOT_SETARG(args, num_args, XmNloadModel, XmLOAD_IMMEDIATE);
if (is_underline)
- iupmotSetArg(args, num_args, XmNunderlineType, XmSINGLE_LINE);
+ iupMOT_SETARG(args, num_args, XmNunderlineType, XmSINGLE_LINE);
else
- iupmotSetArg(args, num_args, XmNunderlineType, XmNO_LINE);
+ iupMOT_SETARG(args, num_args, XmNunderlineType, XmNO_LINE);
if (is_strikeout)
- iupmotSetArg(args, num_args, XmNstrikethruType, XmSINGLE_LINE);
+ iupMOT_SETARG(args, num_args, XmNstrikethruType, XmSINGLE_LINE);
else
- iupmotSetArg(args, num_args, XmNstrikethruType, XmNO_LINE);
+ iupMOT_SETARG(args, num_args, XmNstrikethruType, XmNO_LINE);
rendition = XmRenditionCreate(NULL, "", args, num_args);
diff --git a/iup/src/mot/iupmot_frame.c b/iup/src/mot/iupmot_frame.c
index 39de5d8..cfda44f 100755
--- a/iup/src/mot/iupmot_frame.c
+++ b/iup/src/mot/iupmot_frame.c
@@ -42,22 +42,33 @@ static int motFrameSetBgColorAttrib(Ihandle* ih, const char* value)
{
Pixel color;
- /* ignore given value, must use only from parent */
- value = iupBaseNativeParentGetBgColor(ih);
+ if (!iupAttribGet(ih, "_IUPFRAME_HAS_BGCOLOR"))
+ {
+ /* ignore given value, must use only from parent */
+ value = iupBaseNativeParentGetBgColor(ih);
+ }
color = iupmotColorGetPixelStr(value);
if (color != (Pixel)-1)
{
Widget title_label, child_manager;
- iupmotSetBgColor(ih->handle, color);
+ if (!iupAttribGet(ih, "_IUPFRAME_HAS_BGCOLOR"))
+ {
+ iupmotSetBgColor(ih->handle, color);
- child_manager = XtNameToWidget(ih->handle, "*child_manager");
- iupmotSetBgColor(child_manager, color);
+ child_manager = XtNameToWidget(ih->handle, "*child_manager");
+ iupmotSetBgColor(child_manager, color);
- title_label = XtNameToWidget(ih->handle, "*title_label");
- if (!title_label) return 1;
- iupmotSetBgColor(title_label, color);
+ title_label = XtNameToWidget(ih->handle, "*title_label");
+ if (!title_label) return 1;
+ iupmotSetBgColor(title_label, color);
+ }
+ else
+ {
+ child_manager = XtNameToWidget(ih->handle, "*child_manager");
+ iupmotSetBgColor(child_manager, color);
+ }
return 1;
}
@@ -171,22 +182,25 @@ static int motFrameMapMethod(Ihandle* ih)
{
char* value = iupAttribGetStr(ih, "SUNKEN");
if (iupStrBoolean(value))
- iupmotSetArg(args, num_args, XmNshadowType, XmSHADOW_IN);
+ iupMOT_SETARG(args, num_args, XmNshadowType, XmSHADOW_IN);
else
- iupmotSetArg(args, num_args, XmNshadowType, XmSHADOW_ETCHED_IN);
+ iupMOT_SETARG(args, num_args, XmNshadowType, XmSHADOW_ETCHED_IN);
+
+ if (iupAttribGet(ih, "BGCOLOR"))
+ iupAttribSetStr(ih, "_IUPFRAME_HAS_BGCOLOR", "1");
}
/* Core */
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
/* Manager */
- iupmotSetArg(args, num_args, XmNshadowThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 2);
/* Frame */
- iupmotSetArg(args, num_args, XmNmarginHeight, 0); /* no shadow margins */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0); /* no shadow margins */
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0); /* no shadow margins */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0); /* no shadow margins */
ih->handle = XtCreateManagedWidget(
iupDialogGetChildIdStr(ih), /* child identifier */
@@ -204,11 +218,11 @@ static int motFrameMapMethod(Ihandle* ih)
Widget title_label;
num_args = 0;
/* Label */
- iupmotSetArg(args, num_args, XmNlabelType, XmSTRING);
- iupmotSetArg(args, num_args, XmNmarginHeight, 0); /* default padding */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNlabelType, XmSTRING);
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0); /* default padding */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
/* Frame Constraint */
- iupmotSetArg(args, num_args, XmNchildType, XmFRAME_TITLE_CHILD);
+ iupMOT_SETARG(args, num_args, XmNchildType, XmFRAME_TITLE_CHILD);
title_label = XtCreateManagedWidget("title_label", xmLabelWidgetClass, ih->handle, args, num_args);
iupmotSetString(title_label, XmNlabelString, title);
}
diff --git a/iup/src/mot/iupmot_key.c b/iup/src/mot/iupmot_key.c
index 835b5d7..9897741 100755
--- a/iup/src/mot/iupmot_key.c
+++ b/iup/src/mot/iupmot_key.c
@@ -393,33 +393,33 @@ void iupmotKeyPressEvent(Widget w, Ihandle *ih, XEvent *evt, Boolean *cont)
void iupmotButtonKeySetStatus(unsigned int state, unsigned int but, char* status, int doubleclick)
{
if (state & ShiftMask)
- iupKEYSETSHIFT(status);
+ iupKEY_SETSHIFT(status);
if (state & ControlMask)
- iupKEYSETCONTROL(status);
+ iupKEY_SETCONTROL(status);
if ((state & Button1Mask) || but==Button1)
- iupKEYSETBUTTON1(status);
+ iupKEY_SETBUTTON1(status);
if ((state & Button2Mask) || but==Button2)
- iupKEYSETBUTTON2(status);
+ iupKEY_SETBUTTON2(status);
if ((state & Button3Mask) || but==Button3)
- iupKEYSETBUTTON3(status);
+ iupKEY_SETBUTTON3(status);
if ((state & Button4Mask) || but==Button4)
- iupKEYSETBUTTON4(status);
+ iupKEY_SETBUTTON4(status);
if ((state & Button5Mask) || but==Button5)
- iupKEYSETBUTTON5(status);
+ iupKEY_SETBUTTON5(status);
if (state & Mod1Mask || state & Mod5Mask) /* Alt */
- iupKEYSETALT(status);
+ iupKEY_SETALT(status);
if (state & Mod4Mask) /* Apple/Win */
- iupKEYSETSYS(status);
+ iupKEY_SETSYS(status);
if (doubleclick)
- iupKEYSETDOUBLE(status);
+ iupKEY_SETDOUBLE(status);
}
diff --git a/iup/src/mot/iupmot_label.c b/iup/src/mot/iupmot_label.c
index 52dfc9a..afff3c3 100755
--- a/iup/src/mot/iupmot_label.c
+++ b/iup/src/mot/iupmot_label.c
@@ -147,8 +147,10 @@ static int motLabelSetPaddingAttrib(Ihandle* ih, const char* value)
{
XtVaSetValues(ih->handle, XmNmarginHeight, ih->data->vert_padding,
XmNmarginWidth, ih->data->horiz_padding, NULL);
+ return 0;
}
- return 0;
+ else
+ return 1; /* store until not mapped, when mapped will be set again */
}
static int motLabelMapMethod(Ihandle* ih)
@@ -165,12 +167,12 @@ static int motLabelMapMethod(Ihandle* ih)
if (iupStrEqualNoCase(value, "HORIZONTAL"))
{
ih->data->type = IUP_LABEL_SEP_HORIZ;
- iupmotSetArg(args, num_args, XmNorientation, XmHORIZONTAL);
+ iupMOT_SETARG(args, num_args, XmNorientation, XmHORIZONTAL);
}
else /* "VERTICAL" */
{
ih->data->type = IUP_LABEL_SEP_VERT;
- iupmotSetArg(args, num_args, XmNorientation, XmVERTICAL);
+ iupMOT_SETARG(args, num_args, XmNorientation, XmVERTICAL);
}
}
else
@@ -180,32 +182,32 @@ static int motLabelMapMethod(Ihandle* ih)
if (value)
{
ih->data->type = IUP_LABEL_IMAGE;
- iupmotSetArg(args, num_args, XmNlabelType, XmPIXMAP);
+ iupMOT_SETARG(args, num_args, XmNlabelType, XmPIXMAP);
}
else
{
ih->data->type = IUP_LABEL_TEXT;
- iupmotSetArg(args, num_args, XmNlabelType, XmSTRING);
+ iupMOT_SETARG(args, num_args, XmNlabelType, XmSTRING);
}
}
/* Core */
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
/* Primitive */
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 0);
/* Label */
- iupmotSetArg(args, num_args, XmNrecomputeSize, False); /* no automatic resize from text */
- iupmotSetArg(args, num_args, XmNmarginHeight, 0); /* default padding */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
- iupmotSetArg(args, num_args, XmNmarginTop, 0); /* no extra margins */
- iupmotSetArg(args, num_args, XmNmarginLeft, 0);
- iupmotSetArg(args, num_args, XmNmarginBottom, 0);
- iupmotSetArg(args, num_args, XmNmarginRight, 0);
+ iupMOT_SETARG(args, num_args, XmNrecomputeSize, False); /* no automatic resize from text */
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0); /* default padding */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginTop, 0); /* no extra margins */
+ iupMOT_SETARG(args, num_args, XmNmarginLeft, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginBottom, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginRight, 0);
ih->handle = XtCreateManagedWidget(
iupDialogGetChildIdStr(ih), /* child identifier */
diff --git a/iup/src/mot/iupmot_list.c b/iup/src/mot/iupmot_list.c
index f8e73ed..800e6e9 100755
--- a/iup/src/mot/iupmot_list.c
+++ b/iup/src/mot/iupmot_list.c
@@ -143,15 +143,36 @@ void iupdrvListInsertItem(Ihandle* ih, int pos, const char* value)
motListAddSortedItem(ih, value);
else
motListAddItem(ih, pos, value);
+
+ iupListUpdateOldValue(ih, pos, 0);
}
void iupdrvListRemoveItem(Ihandle* ih, int pos)
{
/* The utility functions use 0=last 1=first */
if (ih->data->is_dropdown || ih->data->has_editbox)
+ {
+ if (ih->data->is_dropdown && !ih->data->has_editbox)
+ {
+ /* must check if removing the current item */
+ int curpos;
+ XtVaGetValues(ih->handle, XmNselectedPosition, &curpos, NULL);
+ if (pos == curpos && iupdrvListGetCount(ih)>1)
+ {
+ if (curpos > 0) curpos--;
+ else curpos++;
+
+ XtRemoveCallback(ih->handle, XmNselectionCallback, (XtCallbackProc)motListComboBoxSelectionCallback, (XtPointer)ih);
+ XtVaSetValues(ih->handle, XmNselectedPosition, curpos, NULL);
+ XtAddCallback(ih->handle, XmNselectionCallback, (XtCallbackProc)motListComboBoxSelectionCallback, (XtPointer)ih);
+ }
+ }
XmComboBoxDeletePos(ih->handle, pos+1);
+ }
else
XmListDeletePos(ih->handle, pos+1);
+
+ iupListUpdateOldValue(ih, pos, 1);
}
void iupdrvListRemoveAllItems(Ihandle* ih)
@@ -174,7 +195,7 @@ void iupdrvListRemoveAllItems(Ihandle* ih)
static char* motListGetIdValueAttrib(Ihandle* ih, const char* name_id)
{
int pos = iupListGetPos(ih, name_id);
- if (pos != -1)
+ if (pos >= 0)
{
XmString* items;
XtVaGetValues(ih->handle, XmNitems, &items, NULL);
@@ -852,8 +873,10 @@ static int motListSetNCAttrib(Ihandle* ih, const char* value)
Widget cbedit;
XtVaGetValues(ih->handle, XmNtextField, &cbedit, NULL);
XtVaSetValues(cbedit, XmNmaxLength, ih->data->nc, NULL);
+ return 0;
}
- return 0;
+ else
+ return 1; /* store until not mapped, when mapped will be set again */
}
static int motListSetClipboardAttrib(Ihandle *ih, const char *value)
@@ -1181,32 +1204,32 @@ static int motListMapMethod(Ihandle* ih)
if (ih->data->is_dropdown || ih->data->has_editbox)
{
/* could not set XmNmappedWhenManaged to False because the list and the edit box where not displayed */
- /* iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); */
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
- iupmotSetArg(args, num_args, XmNmarginHeight, 0);
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
+ /* iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
if (iupAttribGetBoolean(ih, "CANFOCUS"))
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 2);
- iupmotSetArg(args, num_args, XmNshadowThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 2);
if (ih->data->has_editbox)
{
if (ih->data->is_dropdown)
- iupmotSetArg(args, num_args, XmNcomboBoxType, XmDROP_DOWN_COMBO_BOX); /* hidden-list+edit */
+ iupMOT_SETARG(args, num_args, XmNcomboBoxType, XmDROP_DOWN_COMBO_BOX); /* hidden-list+edit */
else
- iupmotSetArg(args, num_args, XmNcomboBoxType, XmCOMBO_BOX); /* visible-list+edit */
+ iupMOT_SETARG(args, num_args, XmNcomboBoxType, XmCOMBO_BOX); /* visible-list+edit */
}
else
- iupmotSetArg(args, num_args, XmNcomboBoxType, XmDROP_DOWN_LIST); /* hidden-list */
+ iupMOT_SETARG(args, num_args, XmNcomboBoxType, XmDROP_DOWN_LIST); /* hidden-list */
ih->handle = XtCreateManagedWidget(
child_id, /* child identifier */
@@ -1220,13 +1243,13 @@ static int motListMapMethod(Ihandle* ih)
/* Create the scrolled window */
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNscrollingPolicy, XmAPPLICATION_DEFINED);
- iupmotSetArg(args, num_args, XmNvisualPolicy, XmVARIABLE);
- iupmotSetArg(args, num_args, XmNscrollBarDisplayPolicy, XmSTATIC); /* can NOT be XmAS_NEEDED because XmAPPLICATION_DEFINED */
- iupmotSetArg(args, num_args, XmNspacing, 0); /* no space between scrollbars and text */
- iupmotSetArg(args, num_args, XmNborderWidth, 0);
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNscrollingPolicy, XmAPPLICATION_DEFINED);
+ iupMOT_SETARG(args, num_args, XmNvisualPolicy, XmVARIABLE);
+ iupMOT_SETARG(args, num_args, XmNscrollBarDisplayPolicy, XmSTATIC); /* can NOT be XmAS_NEEDED because XmAPPLICATION_DEFINED */
+ iupMOT_SETARG(args, num_args, XmNspacing, 0); /* no space between scrollbars and text */
+ iupMOT_SETARG(args, num_args, XmNborderWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
sb_win = XtCreateManagedWidget(
child_id, /* child identifier */
@@ -1243,34 +1266,34 @@ static int motListMapMethod(Ihandle* ih)
/* Create the list */
num_args = 0;
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
if (iupAttribGetBoolean(ih, "CANFOCUS"))
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 2);
- iupmotSetArg(args, num_args, XmNshadowThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 2);
- iupmotSetArg(args, num_args, XmNlistMarginHeight, 0); /* default padding */
- iupmotSetArg(args, num_args, XmNlistMarginWidth, 0);
- iupmotSetArg(args, num_args, XmNlistSpacing, 0);
- iupmotSetArg(args, num_args, XmNlistSizePolicy, XmCONSTANT); /* don't grow to fit, add scrollbar */
+ iupMOT_SETARG(args, num_args, XmNlistMarginHeight, 0); /* default padding */
+ iupMOT_SETARG(args, num_args, XmNlistMarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNlistSpacing, 0);
+ iupMOT_SETARG(args, num_args, XmNlistSizePolicy, XmCONSTANT); /* don't grow to fit, add scrollbar */
if (ih->data->is_multiple)
- iupmotSetArg(args, num_args, XmNselectionPolicy, XmEXTENDED_SELECT);
+ iupMOT_SETARG(args, num_args, XmNselectionPolicy, XmEXTENDED_SELECT);
else
- iupmotSetArg(args, num_args, XmNselectionPolicy, XmBROWSE_SELECT);
+ iupMOT_SETARG(args, num_args, XmNselectionPolicy, XmBROWSE_SELECT);
if (iupAttribGetBoolean(ih, "AUTOHIDE"))
- iupmotSetArg(args, num_args, XmNscrollBarDisplayPolicy, XmAS_NEEDED);
+ iupMOT_SETARG(args, num_args, XmNscrollBarDisplayPolicy, XmAS_NEEDED);
else
- iupmotSetArg(args, num_args, XmNscrollBarDisplayPolicy, XmSTATIC);
+ iupMOT_SETARG(args, num_args, XmNscrollBarDisplayPolicy, XmSTATIC);
ih->handle = XtCreateManagedWidget(
child_id, /* child identifier */
diff --git a/iup/src/mot/iupmot_loop.c b/iup/src/mot/iupmot_loop.c
index 828ddcd..c1f92ec 100755
--- a/iup/src/mot/iupmot_loop.c
+++ b/iup/src/mot/iupmot_loop.c
@@ -56,7 +56,7 @@ void iupdrvSetIdleFunction(Icallback f)
mot_idle_id = XtAppAddWorkProc(iupmot_appcontext, motIdlecbWorkProc, NULL);
}
-static int motLoopStep(void)
+static int motLoopProcessEvent(void)
{
XtAppProcessEvent(iupmot_appcontext, XtIMAll);
return (mot_exitmainloop)? IUP_CLOSE : IUP_DEFAULT;
@@ -79,7 +79,7 @@ int IupMainLoop(void)
while (!mot_exitmainloop)
{
- if (motLoopStep() == IUP_CLOSE)
+ if (motLoopProcessEvent() == IUP_CLOSE)
break;
}
@@ -88,19 +88,26 @@ int IupMainLoop(void)
return IUP_NOERROR;
}
+int IupLoopStepWait(void)
+{
+ while(!XtAppPending(iupmot_appcontext));
+
+ return motLoopProcessEvent();
+}
+
int IupLoopStep(void)
{
if (!XtAppPending(iupmot_appcontext))
return IUP_DEFAULT;
- return motLoopStep();
+ return motLoopProcessEvent();
}
void IupFlush(void)
{
while (XPending(iupmot_display) != 0)
{
- if (motLoopStep() == IUP_CLOSE)
+ if (motLoopProcessEvent() == IUP_CLOSE)
break;
}
diff --git a/iup/src/mot/iupmot_menu.c b/iup/src/mot/iupmot_menu.c
index be9b953..8f51334 100755
--- a/iup/src/mot/iupmot_menu.c
+++ b/iup/src/mot/iupmot_menu.c
@@ -125,7 +125,10 @@ static void motPopupMenuUnmapCallback(Widget w, Ihandle* ih, XtPointer call_data
static void motMenuUnMapMethod(Ihandle* ih)
{
if (iupMenuIsMenuBar(ih))
+ {
XtDestroyWidget(ih->handle);
+ ih->parent = NULL;
+ }
else
XtDestroyWidget(XtParent(ih->handle)); /* in this case the RowColumn widget is a child of a MenuShell. */
}
@@ -146,7 +149,6 @@ static int motMenuMapMethod(Ihandle* ih)
XmNrowColumnType, XmMENU_BAR,
XmNmarginHeight, 0,
XmNmarginWidth, 0,
- XmNresizeWidth, False,
NULL);
if (!ih->handle)
return IUP_ERROR;
@@ -161,8 +163,8 @@ static int motMenuMapMethod(Ihandle* ih)
if (iupAttribGetBoolean(ih, "RADIO"))
{
- iupmotSetArg(args, num_args, XmNpacking, XmPACK_COLUMN);
- iupmotSetArg(args, num_args, XmNradioBehavior, TRUE);
+ iupMOT_SETARG(args, num_args, XmNpacking, XmPACK_COLUMN);
+ iupMOT_SETARG(args, num_args, XmNradioBehavior, TRUE);
}
ih->handle = XmCreatePulldownMenu(
@@ -183,7 +185,7 @@ static int motMenuMapMethod(Ihandle* ih)
{
/* top level menu used for IupPopup */
- iupmotSetArg(args, num_args, XmNpopupEnabled, XmPOPUP_AUTOMATIC);
+ iupMOT_SETARG(args, num_args, XmNpopupEnabled, XmPOPUP_AUTOMATIC);
ih->handle = XmCreatePopupMenu(
iupmot_appshell,
@@ -307,19 +309,19 @@ static int motItemMapMethod(Ihandle* ih)
if (iupAttribGetBoolean(ih->parent, "RADIO"))
{
- iupmotSetArg(args, num_args, XmNtoggleMode, XmTOGGLE_BOOLEAN);
- iupmotSetArg(args, num_args, XmNindicatorType, XmONE_OF_MANY_ROUND);
- iupmotSetArg(args, num_args, XmNindicatorOn, XmINDICATOR_CHECK_BOX);
- iupmotSetArg(args, num_args, XmNindicatorSize, 13);
- iupmotSetArg(args, num_args, XmNselectColor, iupmotColorGetPixel(0, 0, 0));
+ iupMOT_SETARG(args, num_args, XmNtoggleMode, XmTOGGLE_BOOLEAN);
+ iupMOT_SETARG(args, num_args, XmNindicatorType, XmONE_OF_MANY_ROUND);
+ iupMOT_SETARG(args, num_args, XmNindicatorOn, XmINDICATOR_CHECK_BOX);
+ iupMOT_SETARG(args, num_args, XmNindicatorSize, 13);
+ iupMOT_SETARG(args, num_args, XmNselectColor, iupmotColorGetPixel(0, 0, 0));
}
else
{
if (iupAttribGetBoolean(ih, "HIDEMARK"))
- iupmotSetArg(args, num_args, XmNindicatorOn, XmINDICATOR_NONE);
+ iupMOT_SETARG(args, num_args, XmNindicatorOn, XmINDICATOR_NONE);
else
- iupmotSetArg(args, num_args, XmNindicatorOn, XmINDICATOR_CHECK);
- iupmotSetArg(args, num_args, XmNlabelType, iupAttribGet(ih, "TITLEIMAGE")? XmPIXMAP: XmSTRING);
+ iupMOT_SETARG(args, num_args, XmNindicatorOn, XmINDICATOR_CHECK);
+ iupMOT_SETARG(args, num_args, XmNlabelType, iupAttribGet(ih, "TITLEIMAGE")? XmPIXMAP: XmSTRING);
}
ih->handle = XtCreateManagedWidget(
diff --git a/iup/src/mot/iupmot_progressbar.c b/iup/src/mot/iupmot_progressbar.c
index 7266d38..82fa178 100755
--- a/iup/src/mot/iupmot_progressbar.c
+++ b/iup/src/mot/iupmot_progressbar.c
@@ -98,25 +98,25 @@ static int motProgressBarMapMethod(Ihandle* ih)
Arg args[30];
/* Core */
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
/* Primitive */
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 0);
/* Scale */
- iupmotSetArg(args, num_args, XmNminimum, 0);
- iupmotSetArg(args, num_args, XmNmaximum, SHRT_MAX);
- iupmotSetArg(args, num_args, XmNslidingMode, XmTHERMOMETER); /* thermometer effect */
- iupmotSetArg(args, num_args, XmNsliderMark, XmNONE);
- iupmotSetArg(args, num_args, XmNeditable, False);
- iupmotSetArg(args, num_args, XmNshowValue, XmNONE);
+ iupMOT_SETARG(args, num_args, XmNminimum, 0);
+ iupMOT_SETARG(args, num_args, XmNmaximum, SHRT_MAX);
+ iupMOT_SETARG(args, num_args, XmNslidingMode, XmTHERMOMETER); /* thermometer effect */
+ iupMOT_SETARG(args, num_args, XmNsliderMark, XmNONE);
+ iupMOT_SETARG(args, num_args, XmNeditable, False);
+ iupMOT_SETARG(args, num_args, XmNshowValue, XmNONE);
if (iupStrEqualNoCase(iupAttribGetStr(ih, "ORIENTATION"), "VERTICAL"))
{
- iupmotSetArg(args, num_args, XmNorientation, XmVERTICAL);
+ iupMOT_SETARG(args, num_args, XmNorientation, XmVERTICAL);
if (ih->currentheight < ih->currentwidth)
{
@@ -126,7 +126,7 @@ static int motProgressBarMapMethod(Ihandle* ih)
}
}
else
- iupmotSetArg(args, num_args, XmNorientation, XmHORIZONTAL);
+ iupMOT_SETARG(args, num_args, XmNorientation, XmHORIZONTAL);
ih->handle = XtCreateManagedWidget(
iupDialogGetChildIdStr(ih), /* child identifier */
diff --git a/iup/src/mot/iupmot_tabs.c b/iup/src/mot/iupmot_tabs.c
index 7c8a6b5..cafc41d 100755
--- a/iup/src/mot/iupmot_tabs.c
+++ b/iup/src/mot/iupmot_tabs.c
@@ -52,8 +52,10 @@ void iupdrvTabsSetCurrentTab(Ihandle* ih, int pos)
{
Ihandle* child = IupGetChild(ih, pos);
Ihandle* prev_child = IupGetChild(ih, iupdrvTabsGetCurrentTab(ih));
- IupSetAttribute(child, "VISIBLE", "YES");
- IupSetAttribute(prev_child, "VISIBLE", "NO");
+ Widget child_manager = (Widget)iupAttribGet(child, "_IUPTAB_CONTAINER");
+ Widget prev_child_manager = (Widget)iupAttribGet(prev_child, "_IUPTAB_CONTAINER");
+ XtMapWidget(child_manager);
+ if (prev_child_manager) XtUnmapWidget(prev_child_manager);
XtVaSetValues(ih->handle, XmNcurrentPageNumber, pos, NULL);
}
@@ -200,7 +202,7 @@ static int motTabsSetTabTypeAttrib(Ihandle* ih, const char* value)
ih->data->type = ITABS_TOP;
if (ih->handle)
- motTabsUpdateTabType(ih);
+ motTabsUpdateTabType(ih); /* for this to work must be updated in map */
return 0;
}
@@ -313,8 +315,10 @@ void motTabsPageChangedCallback(Widget w, Ihandle* ih, XmNotebookCallbackStruct
IFnnn cb;
Ihandle* child = IupGetChild(ih, nptr->page_number);
Ihandle* prev_child = IupGetChild(ih, nptr->prev_page_number);
- IupSetAttribute(child, "VISIBLE", "YES");
- IupSetAttribute(prev_child, "VISIBLE", "NO");
+ Widget child_manager = (Widget)iupAttribGet(child, "_IUPTAB_CONTAINER");
+ Widget prev_child_manager = (Widget)iupAttribGet(prev_child, "_IUPTAB_CONTAINER");
+ XtMapWidget(child_manager);
+ if (prev_child_manager) XtUnmapWidget(prev_child_manager);
cb = (IFnnn)IupGetCallback(ih, "TABCHANGE_CB");
if (cb)
@@ -397,12 +401,12 @@ static void motTabsChildAddedMethod(Ihandle* ih, Ihandle* child)
/* Create tabs */
/* Label */
- iupmotSetArg(args, num_args, XmNlabelType, tabtitle? XmSTRING: XmPIXMAP);
- iupmotSetArg(args, num_args, XmNmarginHeight, 0);
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNlabelType, tabtitle? XmSTRING: XmPIXMAP);
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
/* Notebook Constraint */
- iupmotSetArg(args, num_args, XmNnotebookChildType, XmMAJOR_TAB);
- iupmotSetArg(args, num_args, XmNpageNumber, pos);
+ iupMOT_SETARG(args, num_args, XmNnotebookChildType, XmMAJOR_TAB);
+ iupMOT_SETARG(args, num_args, XmNpageNumber, pos);
tab_button = XtCreateManagedWidget("tab_button", xmPushButtonWidgetClass, ih->handle, args, num_args);
/* Disable Drag Source */
@@ -450,10 +454,8 @@ static void motTabsChildAddedMethod(Ihandle* ih, Ihandle* child)
iupAttribSetStr(child, "_IUPMOT_TABBUTTON", (char*)tab_button);
iupAttribSetInt(child, "_IUPMOT_TABNUMBER", pos);
- if (pos == iupdrvTabsGetCurrentTab(ih))
- IupSetAttribute(child, "VISIBLE", "YES");
- else
- IupSetAttribute(child, "VISIBLE", "NO");
+ if (pos != iupdrvTabsGetCurrentTab(ih))
+ XtUnmapWidget(child_manager);
}
}
@@ -464,20 +466,11 @@ static void motTabsChildRemovedMethod(Ihandle* ih, Ihandle* child)
Widget child_manager = (Widget)iupAttribGet(child, "_IUPTAB_CONTAINER");
if (child_manager)
{
- int cur_pos, pos;
+ int pos;
Widget tab_button = (Widget)iupAttribGet(child, "_IUPMOT_TABBUTTON");
- cur_pos = iupdrvTabsGetCurrentTab(ih);
pos = iupAttribGetInt(child, "_IUPMOT_TABNUMBER"); /* did not work when using XtVaGetValues(child_manager, XmNpageNumber) */
- if (cur_pos == pos)
- {
- if (cur_pos == 0)
- cur_pos = 1;
- else
- cur_pos--;
-
- iupdrvTabsSetCurrentTab(ih, cur_pos);
- }
+ iupTabsTestRemoveTab(ih, pos);
XtDestroyWidget(tab_button);
XtDestroyWidget(child_manager);
@@ -501,22 +494,22 @@ static int motTabsMapMethod(Ihandle* ih)
return IUP_ERROR;
/* Core */
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
/* Manager */
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 0);
/* Notebook */
- iupmotSetArg(args, num_args, XmNbindingType, XmNONE);
- iupmotSetArg(args, num_args, XmNbindingWidth, 0);
- iupmotSetArg(args, num_args, XmNfirstPageNumber, 0); /* IupTabs index always starts with zero */
- iupmotSetArg(args, num_args, XmNbackPageSize, 0);
- iupmotSetArg(args, num_args, XmNbackPageNumber, 1);
- iupmotSetArg(args, num_args, XmNframeShadowThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNbindingType, XmNONE);
+ iupMOT_SETARG(args, num_args, XmNbindingWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNfirstPageNumber, 0); /* IupTabs index always starts with zero */
+ iupMOT_SETARG(args, num_args, XmNbackPageSize, 0);
+ iupMOT_SETARG(args, num_args, XmNbackPageNumber, 1);
+ iupMOT_SETARG(args, num_args, XmNframeShadowThickness, 2);
ih->handle = XtCreateManagedWidget(
iupDialogGetChildIdStr(ih), /* child identifier */
@@ -589,5 +582,5 @@ void iupdrvTabsInitClass(Iclass* ic)
iupClassRegisterAttribute(ic, "TABORIENTATION", iupTabsGetTabOrientationAttrib, NULL, IUPAF_SAMEASSYSTEM, "HORIZONTAL", IUPAF_READONLY|IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT); /* can not be set, always HORIZONTAL in Motif */
iupClassRegisterAttributeId(ic, "TABTITLE", NULL, motTabsSetTabTitleAttrib, IUPAF_NO_INHERIT);
iupClassRegisterAttributeId(ic, "TABIMAGE", NULL, motTabsSetTabImageAttrib, IUPAF_NO_INHERIT);
- iupClassRegisterAttribute(ic, "PADDING", iupTabsGetPaddingAttrib, motTabsSetPaddingAttrib, IUPAF_SAMEASSYSTEM, "0x0", IUPAF_NOT_MAPPED);
+ iupClassRegisterAttribute(ic, "PADDING", iupTabsGetPaddingAttrib, motTabsSetPaddingAttrib, IUPAF_SAMEASSYSTEM, "0x0", IUPAF_NOT_MAPPED|IUPAF_NO_INHERIT);
}
diff --git a/iup/src/mot/iupmot_text.c b/iup/src/mot/iupmot_text.c
index 4a8f936..d9d2c74 100755
--- a/iup/src/mot/iupmot_text.c
+++ b/iup/src/mot/iupmot_text.c
@@ -142,8 +142,10 @@ static int motTextSetPaddingAttrib(Ihandle* ih, const char* value)
{
XtVaSetValues(ih->handle, XmNmarginHeight, ih->data->vert_padding,
XmNmarginWidth, ih->data->horiz_padding, NULL);
+ return 0;
}
- return 0;
+ else
+ return 1; /* store until not mapped, when mapped will be set again */
}
static int motTextSetReadOnlyAttrib(Ihandle* ih, const char* value)
@@ -164,7 +166,7 @@ static char* motTextGetReadOnlyAttrib(Ihandle* ih)
static int motTextSetInsertAttrib(Ihandle* ih, const char* value)
{
- if (!ih->handle) /* do not store the action before map */
+ if (!ih->handle) /* do not do the action before map */
return 0;
if (!value)
return 0;
@@ -207,12 +209,12 @@ static char* motTextGetSelectedTextAttrib(Ihandle* ih)
static int motTextSetAppendAttrib(Ihandle* ih, const char* value)
{
XmTextPosition pos;
- if (!ih->handle) /* do not store the action before map */
+ if (!ih->handle) /* do not do the action before map */
return 0;
pos = XmTextGetLastPosition(ih->handle);
/* disable callbacks */
iupAttribSetStr(ih, "_IUPMOT_DISABLE_TEXT_CB", "1");
- if (ih->data->is_multiline && ih->data->append_newline)
+ if (ih->data->is_multiline && ih->data->append_newline && pos!=0)
XmTextInsert(ih->handle, pos, "\n");
if (value)
XmTextInsert(ih->handle, pos+1, (char*)value);
@@ -482,8 +484,12 @@ static int motTextSetNCAttrib(Ihandle* ih, const char* value)
if (!iupStrToInt(value, &ih->data->nc))
ih->data->nc = INT_MAX;
if (ih->handle)
+ {
XtVaSetValues(ih->handle, XmNmaxLength, ih->data->nc, NULL);
- return 0;
+ return 0;
+ }
+ else
+ return 1; /* store until not mapped, when mapped will be set again */
}
static int motTextSetClipboardAttrib(Ihandle *ih, const char *value)
@@ -911,6 +917,10 @@ static void motTextLayoutUpdateMethod(Ihandle* ih)
Widget spinbox = (Widget)iupAttribGet(ih, "_IUP_EXTRAPARENT");
if (spinbox && XmIsSpinBox(spinbox))
{
+ /* avoid abort in X */
+ if (ih->currentwidth == 0) ih->currentwidth = 1;
+ if (ih->currentheight == 0) ih->currentheight = 1;
+
XtVaSetValues(ih->handle,
XmNwidth, (XtArgVal)ih->currentwidth-ih->currentheight/2,
XmNheight, (XtArgVal)ih->currentheight,
@@ -952,13 +962,13 @@ static int motTextMapMethod(Ihandle* ih)
/* Create the scrolled window */
/******************************/
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNscrollingPolicy, XmAPPLICATION_DEFINED);
- iupmotSetArg(args, num_args, XmNvisualPolicy, XmVARIABLE);
- iupmotSetArg(args, num_args, XmNscrollBarDisplayPolicy, XmSTATIC); /* can NOT be XmAS_NEEDED because XmAPPLICATION_DEFINED */
- iupmotSetArg(args, num_args, XmNspacing, 0); /* no space between scrollbars and text */
- iupmotSetArg(args, num_args, XmNborderWidth, 0);
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNscrollingPolicy, XmAPPLICATION_DEFINED);
+ iupMOT_SETARG(args, num_args, XmNvisualPolicy, XmVARIABLE);
+ iupMOT_SETARG(args, num_args, XmNscrollBarDisplayPolicy, XmSTATIC); /* can NOT be XmAS_NEEDED because XmAPPLICATION_DEFINED */
+ iupMOT_SETARG(args, num_args, XmNspacing, 0); /* no space between scrollbars and text */
+ iupMOT_SETARG(args, num_args, XmNborderWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
sb_win = XtCreateManagedWidget(
child_id, /* child identifier */
@@ -973,9 +983,9 @@ static int motTextMapMethod(Ihandle* ih)
child_id = "text";
num_args = 0;
- iupmotSetArg(args, num_args, XmNeditMode, XmMULTI_LINE_EDIT);
+ iupMOT_SETARG(args, num_args, XmNeditMode, XmMULTI_LINE_EDIT);
if (wordwrap)
- iupmotSetArg(args, num_args, XmNwordWrap, True);
+ iupMOT_SETARG(args, num_args, XmNwordWrap, True);
}
else
{
@@ -986,18 +996,18 @@ static int motTextMapMethod(Ihandle* ih)
Widget spinbox;
num_args = 0;
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNspacing, 0); /* no space between spin and text */
- iupmotSetArg(args, num_args, XmNborderWidth, 0);
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
- iupmotSetArg(args, num_args, XmNmarginHeight, 0);
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
- iupmotSetArg(args, num_args, XmNarrowSize, 8);
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNspacing, 0); /* no space between spin and text */
+ iupMOT_SETARG(args, num_args, XmNborderWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNarrowSize, 8);
if (iupStrEqualNoCase(iupAttribGetStr(ih, "SPINALIGN"), "LEFT"))
- iupmotSetArg(args, num_args, XmNarrowLayout, XmARROWS_BEGINNING);
+ iupMOT_SETARG(args, num_args, XmNarrowLayout, XmARROWS_BEGINNING);
else
- iupmotSetArg(args, num_args, XmNarrowLayout, XmARROWS_END);
+ iupMOT_SETARG(args, num_args, XmNarrowLayout, XmARROWS_END);
spinbox = XtCreateManagedWidget(
child_id, /* child identifier */
@@ -1019,61 +1029,61 @@ static int motTextMapMethod(Ihandle* ih)
}
num_args = 0;
- iupmotSetArg(args, num_args, XmNeditMode, XmSINGLE_LINE_EDIT);
+ iupMOT_SETARG(args, num_args, XmNeditMode, XmSINGLE_LINE_EDIT);
if (spin)
{
/* Spin Constraints */
- iupmotSetArg(args, num_args, XmNspinBoxChildType, XmNUMERIC);
- iupmotSetArg(args, num_args, XmNminimumValue, 0);
- iupmotSetArg(args, num_args, XmNmaximumValue, 100);
- iupmotSetArg(args, num_args, XmNposition, 0);
+ iupMOT_SETARG(args, num_args, XmNspinBoxChildType, XmNUMERIC);
+ iupMOT_SETARG(args, num_args, XmNminimumValue, 0);
+ iupMOT_SETARG(args, num_args, XmNmaximumValue, 100);
+ iupMOT_SETARG(args, num_args, XmNposition, 0);
if (iupAttribGetBoolean(ih, "SPINWRAP"))
- iupmotSetArg(args, num_args, XmNwrap, TRUE);
+ iupMOT_SETARG(args, num_args, XmNwrap, TRUE);
else
- iupmotSetArg(args, num_args, XmNwrap, FALSE);
+ iupMOT_SETARG(args, num_args, XmNwrap, FALSE);
}
else
{
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
}
}
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
- iupmotSetArg(args, num_args, XmNmarginHeight, 0); /* default padding */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0); /* default padding */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
if (iupAttribGetBoolean(ih, "CANFOCUS"))
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 2);
- iupmotSetArg(args, num_args, XmNverifyBell, False);
- iupmotSetArg(args, num_args, XmNspacing, 0);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNverifyBell, False);
+ iupMOT_SETARG(args, num_args, XmNspacing, 0);
if (iupAttribGetBoolean(ih, "BORDER"))
- iupmotSetArg(args, num_args, XmNshadowThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 2);
else
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
if (ih->data->is_multiline)
{
if (ih->data->sb & IUP_SB_HORIZ)
- iupmotSetArg(args, num_args, XmNscrollHorizontal, True);
+ iupMOT_SETARG(args, num_args, XmNscrollHorizontal, True);
else
- iupmotSetArg(args, num_args, XmNscrollHorizontal, False);
+ iupMOT_SETARG(args, num_args, XmNscrollHorizontal, False);
if (ih->data->sb & IUP_SB_VERT)
- iupmotSetArg(args, num_args, XmNscrollVertical, True);
+ iupMOT_SETARG(args, num_args, XmNscrollVertical, True);
else
- iupmotSetArg(args, num_args, XmNscrollVertical, False);
+ iupMOT_SETARG(args, num_args, XmNscrollVertical, False);
}
ih->handle = XtCreateManagedWidget(
diff --git a/iup/src/mot/iupmot_toggle.c b/iup/src/mot/iupmot_toggle.c
index b18f24d..1fda258 100755
--- a/iup/src/mot/iupmot_toggle.c
+++ b/iup/src/mot/iupmot_toggle.c
@@ -236,8 +236,10 @@ static int motToggleSetPaddingAttrib(Ihandle* ih, const char* value)
{
XtVaSetValues(ih->handle, XmNmarginHeight, ih->data->vert_padding,
XmNmarginWidth, ih->data->horiz_padding, NULL);
+ return 0;
}
- return 0;
+ else
+ return 1; /* store until not mapped, when mapped will be set again */
}
static char* motToggleGetSelectColorAttrib(Ihandle* ih)
@@ -336,40 +338,40 @@ static int motToggleMapMethod(Ihandle* ih)
if (value)
{
ih->data->type = IUP_TOGGLE_IMAGE;
- iupmotSetArg(args, num_args, XmNlabelType, XmPIXMAP);
+ iupMOT_SETARG(args, num_args, XmNlabelType, XmPIXMAP);
}
else
{
ih->data->type = IUP_TOGGLE_TEXT;
- iupmotSetArg(args, num_args, XmNlabelType, XmSTRING);
+ iupMOT_SETARG(args, num_args, XmNlabelType, XmSTRING);
}
/* Core */
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
/* Primitive */
if (iupAttribGetBoolean(ih, "CANFOCUS"))
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 2);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
/* Label */
- iupmotSetArg(args, num_args, XmNrecomputeSize, False); /* no automatic resize from text */
- iupmotSetArg(args, num_args, XmNmarginHeight, 0); /* default padding */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
- iupmotSetArg(args, num_args, XmNmarginTop, 0); /* no extra margins */
- iupmotSetArg(args, num_args, XmNmarginLeft, 0);
- iupmotSetArg(args, num_args, XmNmarginBottom, 0);
- iupmotSetArg(args, num_args, XmNmarginRight, 0);
+ iupMOT_SETARG(args, num_args, XmNrecomputeSize, False); /* no automatic resize from text */
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0); /* default padding */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginTop, 0); /* no extra margins */
+ iupMOT_SETARG(args, num_args, XmNmarginLeft, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginBottom, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginRight, 0);
if (radio)
{
- iupmotSetArg(args, num_args, XmNtoggleMode, XmTOGGLE_BOOLEAN);
- iupmotSetArg(args, num_args, XmNindicatorType, XmONE_OF_MANY_ROUND);
+ iupMOT_SETARG(args, num_args, XmNtoggleMode, XmTOGGLE_BOOLEAN);
+ iupMOT_SETARG(args, num_args, XmNindicatorType, XmONE_OF_MANY_ROUND);
if (!iupAttribGet(radio, "_IUPMOT_LASTTOGGLE"))
{
@@ -380,33 +382,33 @@ static int motToggleMapMethod(Ihandle* ih)
else
{
if (ih->data->type == IUP_TOGGLE_TEXT && iupAttribGetBoolean(ih, "3STATE"))
- iupmotSetArg(args, num_args, XmNtoggleMode, XmTOGGLE_INDETERMINATE);
+ iupMOT_SETARG(args, num_args, XmNtoggleMode, XmTOGGLE_INDETERMINATE);
else
- iupmotSetArg(args, num_args, XmNtoggleMode, XmTOGGLE_BOOLEAN);
- iupmotSetArg(args, num_args, XmNindicatorType, XmN_OF_MANY);
+ iupMOT_SETARG(args, num_args, XmNtoggleMode, XmTOGGLE_BOOLEAN);
+ iupMOT_SETARG(args, num_args, XmNindicatorType, XmN_OF_MANY);
}
if (ih->data->type == IUP_TOGGLE_IMAGE)
{
- iupmotSetArg(args, num_args, XmNindicatorOn, XmINDICATOR_NONE);
- iupmotSetArg(args, num_args, XmNalignment, XmALIGNMENT_CENTER);
- iupmotSetArg(args, num_args, XmNshadowThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNindicatorOn, XmINDICATOR_NONE);
+ iupMOT_SETARG(args, num_args, XmNalignment, XmALIGNMENT_CENTER);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 2);
}
else
{
- iupmotSetArg(args, num_args, XmNspacing, 3);
- iupmotSetArg(args, num_args, XmNindicatorOn, XmINDICATOR_CHECK_BOX);
- iupmotSetArg(args, num_args, XmNalignment, XmALIGNMENT_BEGINNING);
+ iupMOT_SETARG(args, num_args, XmNspacing, 3);
+ iupMOT_SETARG(args, num_args, XmNindicatorOn, XmINDICATOR_CHECK_BOX);
+ iupMOT_SETARG(args, num_args, XmNalignment, XmALIGNMENT_BEGINNING);
if (radio)
{
- iupmotSetArg(args, num_args, XmNindicatorSize, 13);
- iupmotSetArg(args, num_args, XmNselectColor, iupmotColorGetPixel(0, 0, 0));
+ iupMOT_SETARG(args, num_args, XmNindicatorSize, 13);
+ iupMOT_SETARG(args, num_args, XmNselectColor, iupmotColorGetPixel(0, 0, 0));
}
else
- iupmotSetArg(args, num_args, XmNindicatorSize, 15);
+ iupMOT_SETARG(args, num_args, XmNindicatorSize, 15);
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
- iupmotSetArg(args, num_args, XmNdetailShadowThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNdetailShadowThickness, 2);
}
ih->handle = XtCreateManagedWidget(
diff --git a/iup/src/mot/iupmot_tree.c b/iup/src/mot/iupmot_tree.c
index eb230af..fa5ef09 100755
--- a/iup/src/mot/iupmot_tree.c
+++ b/iup/src/mot/iupmot_tree.c
@@ -46,48 +46,20 @@ typedef struct _motTreeItemData
Pixmap image, image_mask;
Pixmap image_expanded, image_expanded_mask;
unsigned char kind;
- void* userdata;
} motTreeItemData;
static void motTreeShowEditField(Ihandle* ih, Widget wItem);
-static int motTreeGetNodeId(Ihandle* ih, Widget wItem);
+static void motTreeRemoveNode(Ihandle* ih, Widget wItem, int del_data, int call_cb);
-typedef int (*motTreeNodeFunc)(Ihandle* ih, Widget wItem, void* userdata);
-
-static int motTreeForEach(Ihandle* ih, Widget wItem, motTreeNodeFunc func, void* userdata)
-{
- WidgetList wItemChildList = NULL;
- int i, numChild;
-
- if (!wItem)
- wItem = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
-
- if (!func(ih, wItem, userdata))
- return 0;
-
- numChild = XmContainerGetItemChildren(ih->handle, wItem, &wItemChildList);
- for (i=0; i<numChild; i++)
- {
- /* Recursively traverse child items */
- if (!motTreeForEach(ih, wItemChildList[i], func, userdata))
- {
- XtFree((char*)wItemChildList);
- return 0;
- }
- }
- if (wItemChildList) XtFree((char*)wItemChildList);
-
- return 1;
-}
/*****************************************************************************/
/* COPYING ITEMS (Branches and its children) */
/*****************************************************************************/
/* Insert the copied item in a new location. Returns the new item. */
-static Widget motTreeCopyItem(Ihandle* ih, Widget wItem, Widget wParent, int pos, int full_copy)
+static Widget motTreeCopyItem(Ihandle* ih, Widget wItem, Widget wParent, int pos, int is_copy)
{
- Widget wNewItem;
+ Widget wItemNew;
XmString title;
motTreeItemData *itemData;
Pixel fgcolor, bgcolor;
@@ -96,13 +68,13 @@ static Widget motTreeCopyItem(Ihandle* ih, Widget wItem, Widget wParent, int pos
Pixmap image = XmUNSPECIFIED_PIXMAP, mask = XmUNSPECIFIED_PIXMAP;
unsigned char state;
- iupmotSetArg(args, num_args, XmNentryParent, wParent);
- iupmotSetArg(args, num_args, XmNmarginHeight, ih->data->spacing);
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
- iupmotSetArg(args, num_args, XmNviewType, XmSMALL_ICON);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNentryParent, wParent);
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, ih->data->spacing);
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNviewType, XmSMALL_ICON);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
/* Get values to copy */
XtVaGetValues(wItem, XmNlabelString, &title,
@@ -113,49 +85,73 @@ static Widget motTreeCopyItem(Ihandle* ih, Widget wItem, Widget wParent, int pos
XmNoutlineState, &state,
NULL);
- if (full_copy) /* during a full copy the userdata reference is not copied */
+ if (is_copy) /* during a copy the itemdata reference is not reused */
{
/* create a new one */
motTreeItemData* itemDataNew = malloc(sizeof(motTreeItemData));
memcpy(itemDataNew, itemData, sizeof(motTreeItemData));
- itemDataNew->userdata = NULL;
itemData = itemDataNew;
}
- iupmotSetArg(args, num_args, XmNlabelString, title);
- iupmotSetArg(args, num_args, XmNuserData, itemData);
- iupmotSetArg(args, num_args, XmNforeground, fgcolor);
- iupmotSetArg(args, num_args, XmNsmallIconPixmap, image);
- iupmotSetArg(args, num_args, XmNsmallIconMask, mask);
- iupmotSetArg(args, num_args, XmNoutlineState, state);
+ iupMOT_SETARG(args, num_args, XmNlabelString, title);
+ iupMOT_SETARG(args, num_args, XmNuserData, itemData);
+ iupMOT_SETARG(args, num_args, XmNforeground, fgcolor);
+ iupMOT_SETARG(args, num_args, XmNsmallIconPixmap, image);
+ iupMOT_SETARG(args, num_args, XmNsmallIconMask, mask);
+ iupMOT_SETARG(args, num_args, XmNoutlineState, state);
- iupmotSetArg(args, num_args, XmNentryParent, wParent);
- iupmotSetArg(args, num_args, XmNpositionIndex, pos);
+ iupMOT_SETARG(args, num_args, XmNentryParent, wParent);
+ iupMOT_SETARG(args, num_args, XmNpositionIndex, pos);
XtVaGetValues(ih->handle, XmNbackground, &bgcolor, NULL);
- iupmotSetArg(args, num_args, XmNbackground, bgcolor);
+ iupMOT_SETARG(args, num_args, XmNbackground, bgcolor);
+
+ /* Add the new node */
+ wItemNew = XtCreateManagedWidget("icon", xmIconGadgetClass, ih->handle, args, num_args);
+ ih->data->node_count++;
+
+ XtRealizeWidget(wItemNew);
+
+ return wItemNew;
+}
+
+static void motTreeChildRebuildCacheRec(Ihandle* ih, Widget wItem, int *id)
+{
+ WidgetList itemChildList = NULL;
+ int i, numChild;
- wNewItem = XtCreateManagedWidget("icon", xmIconGadgetClass, ih->handle, args, num_args);
+ /* Check whether we have child items */
+ numChild = XmContainerGetItemChildren(ih->handle, wItem, &itemChildList);
+
+ for (i = 0; i < numChild; i++)
+ {
+ (*id)++;
+ ih->data->node_cache[*id].node_handle = itemChildList[i];
- /* Root always expanded */
- XtVaSetValues((Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM"), XmNoutlineState, XmEXPANDED, NULL);
+ /* go recursive to children */
+ motTreeChildRebuildCacheRec(ih, itemChildList[i], id);
+ }
- XtRealizeWidget(wNewItem);
+ if (itemChildList) XtFree((char*)itemChildList);
+}
- return wNewItem;
+static void motTreeRebuildNodeCache(Ihandle* ih, int id, Widget wItem)
+{
+ ih->data->node_cache[id].node_handle = wItem;
+ motTreeChildRebuildCacheRec(ih, wItem, &id);
}
-static void motTreeCopyChildren(Ihandle* ih, Widget wItemSrc, Widget wItemDst, int full_copy)
+static void motTreeCopyChildren(Ihandle* ih, Widget wItemSrc, Widget wItemDst, int is_copy)
{
WidgetList wItemChildList = NULL;
int i = 0;
int numChild = XmContainerGetItemChildren(ih->handle, wItemSrc, &wItemChildList);
while(i != numChild)
{
- Widget wNewItem = motTreeCopyItem(ih, wItemChildList[i], wItemDst, i, full_copy); /* Use the same order they where enumerated */
+ Widget wItemNew = motTreeCopyItem(ih, wItemChildList[i], wItemDst, i, is_copy); /* Use the same order they where enumerated */
/* Recursively transfer all the items */
- motTreeCopyChildren(ih, wItemChildList[i], wNewItem, full_copy);
+ motTreeCopyChildren(ih, wItemChildList[i], wItemNew, is_copy);
/* Go to next sibling item */
i++;
@@ -165,12 +161,18 @@ static void motTreeCopyChildren(Ihandle* ih, Widget wItemSrc, Widget wItemDst, i
}
/* Copies all items in a branch to a new location. Returns the new branch node. */
-static Widget motTreeCopyNode(Ihandle* ih, Widget wItemSrc, Widget wItemDst, int full_copy)
+static Widget motTreeCopyMoveNode(Ihandle* ih, Widget wItemSrc, Widget wItemDst, int is_copy)
{
- Widget wNewItem, wParent;
+ Widget wItemNew, wParent;
motTreeItemData *itemDataDst;
unsigned char stateDst;
- int pos;
+ int pos, id_new, count, id_src, id_dst;
+
+ int old_count = ih->data->node_count;
+
+ id_src = iupTreeFindNodeId(ih, wItemSrc);
+ id_dst = iupTreeFindNodeId(ih, wItemDst);
+ id_new = id_dst+1; /* contains the position for a copy operation */
XtVaGetValues(wItemDst, XmNoutlineState, &stateDst,
XmNuserData, &itemDataDst,
@@ -184,17 +186,46 @@ static Widget motTreeCopyNode(Ihandle* ih, Widget wItemSrc, Widget wItemDst, int
}
else
{
+ if (itemDataDst->kind == ITREE_BRANCH)
+ {
+ int child_count = iupdrvTreeTotalChildCount(ih, wItemDst);
+ id_new += child_count;
+ }
+
/* copy as next brother of item or collapsed branch */
XtVaGetValues(wItemDst, XmNentryParent, &wParent, NULL);
XtVaGetValues(wItemDst, XmNpositionIndex, &pos, NULL);
pos++;
}
- wNewItem = motTreeCopyItem(ih, wItemSrc, wParent, pos, full_copy);
+ /* move to the same place does nothing */
+ if (!is_copy && id_new == id_src)
+ return NULL;
+
+ wItemNew = motTreeCopyItem(ih, wItemSrc, wParent, pos, is_copy);
+
+ motTreeCopyChildren(ih, wItemSrc, wItemNew, is_copy);
+
+ count = ih->data->node_count - old_count;
+ iupTreeCopyMoveCache(ih, id_src, id_new, count, is_copy);
- motTreeCopyChildren(ih, wItemSrc, wNewItem, full_copy);
+ if (!is_copy)
+ {
+ /* Deleting the node (and its children) from the old position */
+ /* do not delete the itemdata, we reuse the references in CopyNode */
+ motTreeRemoveNode(ih, wItemSrc, 0, 0);
+
+ /* restore count, because we remove src */
+ ih->data->node_count = old_count;
+
+ /* compensate position for a move */
+ if (id_new > id_src)
+ id_new -= count;
+ }
- return wNewItem;
+ motTreeRebuildNodeCache(ih, id_new, wItemNew);
+
+ return wItemNew;
}
static void motTreeContainerDeselectAll(Ihandle *ih)
@@ -233,229 +264,181 @@ static void motTreeContainerSelectAll(Ihandle *ih)
XtCallActionProc(ih->handle, "ContainerSelectAll", (XEvent*)&ev, 0, 0);
}
-static Widget motTreeGetLastVisibleNode(Ihandle* ih, Widget wItem)
+static int motTreeIsNodeVisible(Widget wItem, Widget *wLastItemParent)
{
- unsigned char itemState;
-
- XtVaGetValues(wItem, XmNoutlineState, &itemState, NULL);
-
- if (itemState == XmEXPANDED)
+ unsigned char itemParentState;
+ Widget wItemParent = NULL;
+ XtVaGetValues(wItem, XmNentryParent, &wItemParent, NULL);
+ if (!wItemParent || wItemParent == *wLastItemParent)
+ return 1;
+ while(wItemParent)
{
- WidgetList wChildrenTree = NULL;
- int numChildren = XmContainerGetItemChildren(ih->handle, wItem, &wChildrenTree);
- if(numChildren)
- wItem = motTreeGetLastVisibleNode(ih, wChildrenTree[numChildren - 1]);
- if (wChildrenTree) XtFree((char*)wChildrenTree);
+ XtVaGetValues(wItemParent, XmNoutlineState, &itemParentState, NULL);
+ if (itemParentState != XmEXPANDED)
+ return 0;
+
+ XtVaGetValues(wItemParent, XmNentryParent, &wItemParent, NULL);
}
- return wItem;
+ /* save last parent */
+ XtVaGetValues(wItem, XmNentryParent, &wItemParent, NULL);
+ *wLastItemParent = wItemParent;
+ return 1;
}
-static Widget motTreeFindVisibleNodeId(Ihandle* ih, WidgetList itemList, int numItems, Widget itemNode)
+static Widget motTreeGetLastVisibleNode(Ihandle* ih)
{
- Widget itemChild;
- WidgetList itemChildList;
- int i = 0;
- int numChild;
- unsigned char itemState;
+ int i;
+ Widget wLastItemParent = NULL;
- while(i != numItems)
+ for (i = ih->data->node_count-1; i >= 0; i--)
{
- /* ID control to traverse items */
- ih->data->id_control++; /* not the real id since it counts only the visible ones */
-
- /* StateID founded! */
- if(itemList[i] == itemNode)
- return itemList[i];
-
- /* Check whether we have child items */
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
- XtVaGetValues(itemList[i], XmNoutlineState, &itemState, NULL);
-
- /* The itemWidget has child and it is expanded (visible) */
- if (numChild && itemState == XmEXPANDED)
- {
- /* pass the list of children of this item */
- itemChild = motTreeFindVisibleNodeId(ih, itemChildList, numChild, itemNode);
-
- /* StateID founded! */
- if(itemChild)
- {
- XtFree((char*)itemChildList);
- return itemChild;
- }
- }
-
- if (itemChildList) XtFree((char*)itemChildList);
- /* Go to next sibling item */
- i++;
+ if (motTreeIsNodeVisible(ih->data->node_cache[i].node_handle, &wLastItemParent))
+ return ih->data->node_cache[i].node_handle;
}
- return NULL;
+ return ih->data->node_cache[0].node_handle; /* root is always visible */
}
-static Widget motTreeFindVisibleNodeFromId(Ihandle* ih, WidgetList itemList, int numItems)
+static Widget motTreeGetNextVisibleNode(Ihandle* ih, Widget wItem, int count)
{
- Widget itemChild;
- WidgetList itemChildList;
- int i = 0;
- int numChild;
- unsigned char itemState;
+ int i, id;
+ Widget wLastItemParent = NULL;
- while(i != numItems)
- {
- /* ID control to traverse items */
- ih->data->id_control--; /* not the real id since it counts only the visible ones */
+ id = iupTreeFindNodeId(ih, wItem);
+ id += count;
- /* StateID founded! */
- if(ih->data->id_control < 0)
- return itemList[i];
+ for (i = id; i < ih->data->node_count; i++)
+ {
+ if (motTreeIsNodeVisible(ih->data->node_cache[i].node_handle, &wLastItemParent))
+ return ih->data->node_cache[i].node_handle;
+ }
- /* Check whether we have child items */
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
- XtVaGetValues(itemList[i], XmNoutlineState, &itemState, NULL);
+ return ih->data->node_cache[0].node_handle; /* root is always visible */
+}
- /* The itemWidget has child and it is expanded (visible) */
- if (numChild && itemState == XmEXPANDED)
- {
- /* pass the list of children of this item */
- itemChild = motTreeFindVisibleNodeFromId(ih, itemChildList, numChild);
+static Widget motTreeGetPreviousVisibleNode(Ihandle* ih, Widget wItem, int count)
+{
+ int i, id;
+ Widget wLastItemParent = NULL;
- /* StateID founded! */
- if(ih->data->id_control < 0)
- {
- if (itemChildList) XtFree((char*)itemChildList);
- return itemChild;
- }
- }
+ id = iupTreeFindNodeId(ih, wItem);
+ id -= count;
- if (itemChildList) XtFree((char*)itemChildList);
- /* Go to next sibling item */
- i++;
+ for (i = id; i >= 0; i--)
+ {
+ if (motTreeIsNodeVisible(ih->data->node_cache[i].node_handle, &wLastItemParent))
+ return ih->data->node_cache[i].node_handle;
}
- return NULL;
+ return motTreeGetLastVisibleNode(ih);
}
-static Widget motTreeGetNextVisibleNode(Ihandle* ih, Widget wRoot, Widget wItem)
+static void motTreeChildCountRec(Ihandle* ih, Widget wItem, int *count)
{
- Widget wNext;
+ WidgetList itemChildList = NULL;
+ int i, numChild;
- ih->data->id_control = -1;
- motTreeFindVisibleNodeId(ih, &wRoot, 1, wItem);
- ih->data->id_control++; /* more 1 visible node */
+ /* Check whether we have child items */
+ numChild = XmContainerGetItemChildren(ih->handle, wItem, &itemChildList);
- wNext = motTreeFindVisibleNodeFromId(ih, &wRoot, 1);
+ for (i = 0; i < numChild; i++)
+ {
+ (*count)++;
- if (ih->data->id_control >= 0)
- wNext = motTreeGetLastVisibleNode(ih, wRoot);
+ /* go recursive to children */
+ motTreeChildCountRec(ih, itemChildList[i], count);
+ }
- return wNext;
+ if (itemChildList) XtFree((char*)itemChildList);
}
-static Widget motTreeGetPreviousVisibleNode(Ihandle* ih, Widget wRoot, Widget wItem)
+int iupdrvTreeTotalChildCount(Ihandle* ih, Widget wItem)
{
- ih->data->id_control = -1;
- motTreeFindVisibleNodeId(ih, &wRoot, 1, wItem);
- ih->data->id_control--; /* less 1 visible node */
-
- if (ih->data->id_control < 0)
- ih->data->id_control = 0; /* Begin of tree = Root id */
-
- return motTreeFindVisibleNodeFromId(ih, &wRoot, 1);
+ int count = 0;
+ motTreeChildCountRec(ih, wItem, &count);
+ return count;
}
-static void motTreeUpdateBgColor(Ihandle* ih, WidgetList itemList, int numItems, Pixel bgcolor)
+static void motTreeUpdateBgColor(Ihandle* ih, Pixel bgcolor)
{
- WidgetList itemChildList;
- int i = 0;
- int numChild;
-
- while(i != numItems)
+ int i;
+ for (i = 0; i < ih->data->node_count; i++)
{
- XtVaSetValues(itemList[i], XmNbackground, bgcolor, NULL);
-
- /* Check whether we have child items */
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
- if(numChild)
- motTreeUpdateBgColor(ih, itemChildList, numChild, bgcolor);
- if (itemChildList) XtFree((char*)itemChildList);
-
- /* Go to next sibling item */
- i++;
+ XtVaSetValues(ih->data->node_cache[i].node_handle, XmNbackground, bgcolor, NULL);
}
}
-static void motTreeUpdateImages(Ihandle* ih, WidgetList itemList, int numItems, int mode)
+static void motTreeUpdateImages(Ihandle* ih, int mode)
{
- motTreeItemData *itemData;
- int i = 0;
-
+ int i;
/* called when one of the default images is changed */
-
- while(i != numItems)
+ for (i = 0; i < ih->data->node_count; i++)
{
- /* Get node attributes */
- XtVaGetValues(itemList[i], XmNuserData, &itemData, NULL);
-
+ motTreeItemData *itemData;
+ Widget wItem = ih->data->node_cache[i].node_handle;
+
+ XtVaGetValues(wItem, XmNuserData, &itemData, NULL);
+
if (itemData->kind == ITREE_BRANCH)
{
unsigned char itemState;
- XtVaGetValues(itemList[i], XmNoutlineState, &itemState, NULL);
+ XtVaGetValues(wItem, XmNoutlineState, &itemState, NULL);
if (itemState == XmEXPANDED)
{
if (mode == ITREE_UPDATEIMAGE_EXPANDED)
{
- XtVaSetValues(itemList[i], XmNsmallIconPixmap, (itemData->image_expanded!=XmUNSPECIFIED_PIXMAP)? itemData->image_expanded: (Pixmap)ih->data->def_image_expanded, NULL);
- XtVaSetValues(itemList[i], XmNsmallIconMask, (itemData->image_expanded_mask!=XmUNSPECIFIED_PIXMAP)? itemData->image_expanded_mask: (Pixmap)ih->data->def_image_expanded_mask, NULL);
+ XtVaSetValues(wItem, XmNsmallIconPixmap, (itemData->image_expanded!=XmUNSPECIFIED_PIXMAP)? itemData->image_expanded: (Pixmap)ih->data->def_image_expanded, NULL);
+ XtVaSetValues(wItem, XmNsmallIconMask, (itemData->image_expanded_mask!=XmUNSPECIFIED_PIXMAP)? itemData->image_expanded_mask: (Pixmap)ih->data->def_image_expanded_mask, NULL);
}
}
else
{
if (mode == ITREE_UPDATEIMAGE_COLLAPSED)
{
- XtVaSetValues(itemList[i], XmNsmallIconPixmap, (itemData->image!=XmUNSPECIFIED_PIXMAP)? itemData->image: (Pixmap)ih->data->def_image_collapsed, NULL);
- XtVaSetValues(itemList[i], XmNsmallIconMask, (itemData->image_mask!=XmUNSPECIFIED_PIXMAP)? itemData->image_mask: (Pixmap)ih->data->def_image_collapsed_mask, NULL);
+ XtVaSetValues(wItem, XmNsmallIconPixmap, (itemData->image!=XmUNSPECIFIED_PIXMAP)? itemData->image: (Pixmap)ih->data->def_image_collapsed, NULL);
+ XtVaSetValues(wItem, XmNsmallIconMask, (itemData->image_mask!=XmUNSPECIFIED_PIXMAP)? itemData->image_mask: (Pixmap)ih->data->def_image_collapsed_mask, NULL);
}
}
-
- /* Recursively traverse child items */
- {
- WidgetList itemChildList;
- int numChild;
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
- motTreeUpdateImages(ih, itemChildList, numChild, mode);
- if (itemChildList) XtFree((char*)itemChildList);
- }
}
else
{
if (mode == ITREE_UPDATEIMAGE_LEAF)
{
- XtVaSetValues(itemList[i], XmNsmallIconPixmap, (itemData->image!=XmUNSPECIFIED_PIXMAP)? itemData->image: (Pixmap)ih->data->def_image_leaf, NULL);
- XtVaSetValues(itemList[i], XmNsmallIconMask, (itemData->image_mask!=XmUNSPECIFIED_PIXMAP)? itemData->image_mask: (Pixmap)ih->data->def_image_leaf_mask, NULL);
+ XtVaSetValues(wItem, XmNsmallIconPixmap, (itemData->image!=XmUNSPECIFIED_PIXMAP)? itemData->image: (Pixmap)ih->data->def_image_leaf, NULL);
+ XtVaSetValues(wItem, XmNsmallIconMask, (itemData->image_mask!=XmUNSPECIFIED_PIXMAP)? itemData->image_mask: (Pixmap)ih->data->def_image_leaf_mask, NULL);
}
}
-
- /* Go to next sibling node */
- i++;
}
}
-static int motTreeSelectFunc(Ihandle* ih, Widget wItem, int *select)
+static int motTreeIsNodeSelected(Widget wItem)
+{
+ unsigned char isSelected;
+ XtVaGetValues(wItem, XmNvisualEmphasis, &isSelected, NULL);
+ if(isSelected == XmSELECTED)
+ return 1;
+ else
+ return 0;
+}
+
+static void motTreeSelectNode(Widget wItem, int select)
+{
+ if (select == -1)
+ select = !motTreeIsNodeSelected(wItem); /* toggle */
+
+ if (select)
+ XtVaSetValues(wItem, XmNvisualEmphasis, XmSELECTED, NULL);
+ else
+ XtVaSetValues(wItem, XmNvisualEmphasis, XmNOT_SELECTED, NULL);
+}
+
+static int motTreeSelectFunc(Ihandle* ih, Widget wItem, int id, int *select)
{
int do_select = *select;
if (do_select == -1)
- {
- unsigned char isSelected;
- XtVaGetValues(wItem, XmNvisualEmphasis, &isSelected, NULL);
- do_select = (isSelected == XmSELECTED)? 0: 1; /* toggle */
- }
+ do_select = !motTreeIsNodeSelected(wItem); /* toggle */
if (do_select)
XtVaSetValues(wItem, XmNvisualEmphasis, XmSELECTED, NULL);
@@ -463,272 +446,111 @@ static int motTreeSelectFunc(Ihandle* ih, Widget wItem, int *select)
XtVaSetValues(wItem, XmNvisualEmphasis, XmNOT_SELECTED, NULL);
(void)ih;
+ (void)id;
return 1;
}
static void motTreeInvertAllNodeMarking(Ihandle* ih)
{
int select = -1;
- motTreeForEach(ih, NULL, (motTreeNodeFunc)motTreeSelectFunc, &select);
+ iupTreeForEach(ih, (iupTreeNodeFunc)motTreeSelectFunc, &select);
}
-typedef struct _motTreeRange{
- Widget wItem1, wItem2;
- char inside, clear;
-}motTreeRange;
-
-static int motTreeSelectRangeFunc(Ihandle* ih, Widget wItem, motTreeRange* range)
+static void motTreeSelectRange(Ihandle* ih, Widget wItem1, Widget wItem2, int clear)
{
- int end_range = 0;
-
- if (range->inside == 0) /* detect the range start */
- {
- if (range->wItem1 == wItem) range->inside=1;
- else if (range->wItem2 == wItem) range->inside=1;
- }
- else if (range->inside == 1) /* detect the range end */
+ int i;
+ int id1 = iupTreeFindNodeId(ih, wItem1);
+ int id2 = iupTreeFindNodeId(ih, wItem2);
+ if (id1 > id2)
{
- if (range->wItem1 == wItem) end_range=1;
- else if (range->wItem2 == wItem) end_range=1;
+ int tmp = id1;
+ id1 = id2;
+ id2 = tmp;
}
- if (range->inside == 1) /* if inside, select */
- XtVaSetValues(wItem, XmNvisualEmphasis, XmSELECTED, NULL);
- else if (range->clear) /* if outside and clear, unselect */
- XtVaSetValues(wItem, XmNvisualEmphasis, XmNOT_SELECTED, NULL);
-
- if (end_range || (range->inside && range->wItem1==range->wItem2))
- range->inside=-1; /* update after selecting the node */
-
- (void)ih;
- return 1;
-}
-
-static void motTreeSelectRange(Ihandle* ih, Widget wItem1, Widget wItem2, int clear)
-{
- motTreeRange range;
- range.wItem1 = wItem1;
- range.wItem2 = wItem2;
- range.inside = 0;
- range.clear = (char)clear;
- motTreeForEach(ih, NULL, (motTreeNodeFunc)motTreeSelectRangeFunc, &range);
-}
-
-void motTreeExpandCollapseAllNodes(Ihandle* ih, WidgetList itemList, int numItems, unsigned char itemState)
-{
- WidgetList itemChildList;
- int numChild;
- int i = 0;
-
- while(i != numItems)
+ for (i = 0; i < ih->data->node_count; i++)
{
- /* Check whether we have child items */
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
-
- if(numChild)
+ if (i < id1 || i > id2)
{
- XtVaSetValues(itemList[i], XmNoutlineState, itemState, NULL);
- motTreeExpandCollapseAllNodes(ih, itemChildList, numChild, itemState);
+ if (clear)
+ XtVaSetValues(ih->data->node_cache[i].node_handle, XmNvisualEmphasis, XmNOT_SELECTED, NULL);
}
-
- if (itemChildList) XtFree((char*)itemChildList);
- /* Go to next sibling item */
- i++;
+ else
+ XtVaSetValues(ih->data->node_cache[i].node_handle, XmNvisualEmphasis, XmSELECTED, NULL);
}
}
-static void motTreeDestroyItemData(Ihandle* ih, Widget wItem)
+void motTreeExpandCollapseAllNodes(Ihandle* ih, unsigned char itemState)
{
- motTreeItemData *itemData = NULL;
- XtVaGetValues(wItem, XmNuserData, &itemData, NULL);
- if (itemData)
+ int i;
+ /* called when one of the default images is changed */
+ for (i = 0; i < ih->data->node_count; i++)
{
- IFnis cb = (IFnis)IupGetCallback(ih, "NODEREMOVED_CB");
- if (cb) cb(ih, motTreeGetNodeId(ih, wItem), (char*)itemData->userdata);
- free(itemData);
- XtVaSetValues(wItem, XmNuserData, NULL, NULL);
- }
-}
-
-static void motTreeRemoveChildren(Ihandle* ih, WidgetList itemList, int numItems, int del_userdata)
-{
- WidgetList itemChildList;
- int numChild;
- int i = 0;
+ motTreeItemData *itemData;
+ Widget wItem = ih->data->node_cache[i].node_handle;
- while(i != numItems)
- {
+ XtVaGetValues(wItem, XmNuserData, &itemData, NULL);
+
/* Check whether we have child items */
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
- if (numChild)
- motTreeRemoveChildren(ih, itemChildList, numChild, del_userdata);
-
- if (del_userdata)
- motTreeDestroyItemData(ih, itemList[i]);
-
- XtDestroyWidget(itemList[i]);
-
- if (itemChildList) XtFree((char*)itemChildList);
- /* Go to next sibling item */
- i++;
+ if (itemData->kind == ITREE_BRANCH)
+ XtVaSetValues(wItem, XmNoutlineState, itemState, NULL);
}
}
-static void motTreeRemoveNode(Ihandle* ih, Widget wItem, int del_userdata)
+static void motTreeDestroyItemData(Ihandle* ih, Widget wItem, int del_data, IFns cb, int id)
{
- WidgetList wChildList = NULL;
- int numChild = XmContainerGetItemChildren(ih->handle, wItem, &wChildList);
- if (numChild)
- motTreeRemoveChildren(ih, wChildList, numChild, del_userdata);
- if (del_userdata)
- motTreeDestroyItemData(ih, wItem);
- XtDestroyWidget(wItem);
- if (wChildList) XtFree((char*)wChildList);
-}
-
-static Widget motTreeFindNodeID(Ihandle* ih, WidgetList itemList, int numItems, Widget itemNode)
-{
- Widget itemChild;
- WidgetList itemChildList;
- int i = 0;
- int numChild;
-
- while(i != numItems)
+ motTreeItemData *itemData = NULL;
+ XtVaGetValues(wItem, XmNuserData, &itemData, NULL);
+ if (itemData)
{
- /* ID control to traverse items */
- ih->data->id_control++;
+ if (cb)
+ cb(ih, (char*)ih->data->node_cache[id].userdata);
- /* StateID founded! */
- if(itemList[i] == itemNode)
- return itemList[i];
-
- /* Check whether we have child items */
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
- if(numChild)
+ if (del_data)
{
- /* pass the list of children of this item */
- itemChild = motTreeFindNodeID(ih, itemChildList, numChild, itemNode);
-
- /* StateID founded! */
- if(itemChild)
- {
- if (itemChildList) XtFree((char*)itemChildList);
- return itemChild;
- }
+ free(itemData);
+ XtVaSetValues(wItem, XmNuserData, NULL, NULL);
}
-
- if (itemChildList) XtFree((char*)itemChildList);
- /* Go to next sibling item */
- i++;
}
-
- return NULL;
}
-static Widget motTreeFindNodeFromID(Ihandle* ih, WidgetList itemList, int numItems)
+static void motTreeRemoveNodeRec(Ihandle* ih, Widget wItem, int del_data, IFns cb, int *id)
{
- Widget itemChild;
- WidgetList itemChildList;
- int i = 0;
- int numChild;
+ WidgetList itemChildList = NULL;
+ int i, numChild;
+ int old_id = *id;
- while(i != numItems)
+ /* Check whether we have child items */
+ /* remove from children first */
+ numChild = XmContainerGetItemChildren(ih->handle, wItem, &itemChildList);
+ for (i = 0; i < numChild; i++)
{
- /* ID control to traverse items */
- ih->data->id_control--;
-
- /* StateID founded! */
- if(ih->data->id_control < 0)
- return itemList[i];
-
- /* Check whether we have child items */
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
- if(numChild)
- {
- /* pass the list of children of this item */
- itemChild = motTreeFindNodeFromID(ih, itemChildList, numChild);
-
- /* StateID founded! */
- if(ih->data->id_control < 0)
- {
- if (itemChildList) XtFree((char*)itemChildList);
- return itemChild;
- }
- }
-
- if (itemChildList) XtFree((char*)itemChildList);
- /* Go to next sibling item */
- i++;
+ /* go recursive to children */
+ motTreeRemoveNodeRec(ih, itemChildList[i], del_data, cb, id);
}
+ if (itemChildList) XtFree((char*)itemChildList);
- return NULL;
-}
+ /* actually do it for the node */
+ ih->data->node_count--;
+ (*id)++;
-static int motTreeGetNodeId(Ihandle* ih, Widget wItem)
-{
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
- ih->data->id_control = -1;
- if (motTreeFindNodeID(ih, &wRoot, 1, wItem))
- return ih->data->id_control;
- else
- return -1;
+ if (del_data || cb)
+ motTreeDestroyItemData(ih, wItem, del_data, cb, old_id);
+
+ XtDestroyWidget(wItem); /* must manually destroy each node, this is NOT recursive */
}
-static Widget motTreeFindUserDataID(Ihandle* ih, WidgetList itemList, int numItems, void* userdata)
+static void motTreeRemoveNode(Ihandle* ih, Widget wItem, int del_data, int call_cb)
{
- Widget itemChild;
- WidgetList itemChildList;
- motTreeItemData *itemData;
- int i = 0;
- int numChild;
-
- while(i != numItems)
- {
- /* ID control to traverse items */
- ih->data->id_control++;
-
- XtVaGetValues(itemList[i], XmNuserData, &itemData, NULL);
-
- /* StateID founded! */
- if(itemData->userdata == userdata)
- return itemList[i];
+ IFns cb = call_cb? (IFns)IupGetCallback(ih, "NODEREMOVED_CB"): NULL;
+ int old_count = ih->data->node_count;
+ int id = iupTreeFindNodeId(ih, wItem);
+ int old_id = id;
- /* Check whether we have child items */
- itemChildList = NULL;
- numChild = XmContainerGetItemChildren(ih->handle, itemList[i], &itemChildList);
- if(numChild)
- {
- /* pass the list of children of this item */
- itemChild = motTreeFindUserDataID(ih, itemChildList, numChild, userdata);
-
- /* StateID founded! */
- if (itemChild)
- {
- if (itemChildList) XtFree((char*)itemChildList);
- return itemChild;
- }
- }
+ motTreeRemoveNodeRec(ih, wItem, del_data, cb, &id);
- if (itemChildList) XtFree((char*)itemChildList);
- /* Go to next sibling item */
- i++;
- }
-
- return NULL;
-}
-
-static int motTreeGetUserDataId(Ihandle* ih, void* userdata)
-{
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
- ih->data->id_control = -1;
- if (motTreeFindUserDataID(ih, &wRoot, 1, userdata))
- return ih->data->id_control;
- else
- return -1;
+ if (call_cb)
+ iupTreeDelFromCache(ih, old_id, old_count-ih->data->node_count);
}
static void motTreeSetFocusNode(Ihandle* ih, Widget wItem)
@@ -737,7 +559,7 @@ static void motTreeSetFocusNode(Ihandle* ih, Widget wItem)
XmProcessTraversal(wItem, XmTRAVERSE_CURRENT);
}
-static Widget motTreeGetFocusNode(Ihandle* ih)
+Widget iupdrvTreeGetFocusNode(Ihandle* ih)
{
Widget wItem = XmGetFocusWidget(ih->handle); /* returns the focus in the dialog */
if (wItem && XtParent(wItem) == ih->handle) /* is a node */
@@ -746,18 +568,6 @@ static Widget motTreeGetFocusNode(Ihandle* ih)
return (Widget)iupAttribGet(ih, "_IUPTREE_LAST_FOCUS");
}
-static Widget motTreeFindNodeFromString(Ihandle* ih, const char* name_id)
-{
- if (name_id[0])
- {
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
- iupStrToInt(name_id, &ih->data->id_control);
- return motTreeFindNodeFromID(ih, &wRoot, 1);
- }
- else
- return motTreeGetFocusNode(ih);
-}
-
static void motTreeEnterLeaveWindowEvent(Widget w, Ihandle *ih, XEvent *evt, Boolean *cont)
{
if (iupAttribGet(ih, "_IUPTREE_EDITFIELD"))
@@ -812,16 +622,24 @@ static void motTreeFocusChangeEvent(Widget w, Ihandle *ih, XEvent *evt, Boolean
void iupdrvTreeAddNode(Ihandle* ih, const char* name_id, int kind, const char* title, int add)
{
- Widget wItemPrev = motTreeFindNodeFromString(ih, name_id);
- Widget wNewItem;
+ Widget wItemPrev = iupTreeGetNodeFromString(ih, name_id);
+ Widget wItemNew;
XmString itemTitle;
- motTreeItemData *itemData, *itemDataPrev;
+ motTreeItemData *itemData;
Pixel bgcolor, fgcolor;
- int kindPrev, num_args = 0;
+ int kindPrev = 0, num_args = 0;
Arg args[30];
if (!wItemPrev)
- return;
+ {
+ /* check if the root was really specified */
+ int id = 0;
+ if (!iupStrToInt(name_id, &id) || id != -1)
+ return;
+ }
+
+ if (!title)
+ title = "";
itemData = calloc(1, sizeof(motTreeItemData));
itemData->image = XmUNSPECIFIED_PIXMAP;
@@ -836,138 +654,103 @@ void iupdrvTreeAddNode(Ihandle* ih, const char* name_id, int kind, const char* t
XtVaGetValues(ih->handle, XmNforeground, &fgcolor, NULL);
XtVaGetValues(ih->handle, XmNbackground, &bgcolor, NULL);
- /* Get the kind of previous item */
- XtVaGetValues(wItemPrev, XmNuserData, &itemDataPrev, NULL);
- kindPrev = itemDataPrev->kind;
-
- if (kindPrev == ITREE_BRANCH && add)
+ if (wItemPrev)
{
- /* wItemPrev is parent of the new item (firstchild of it) */
- iupmotSetArg(args, num_args, XmNentryParent, wItemPrev);
- iupmotSetArg(args, num_args, XmNpositionIndex, 0);
- }
- else
- {
- /* wItemPrev is sibling of the new item (set its parent to the new item) */
- Widget wItemParent;
- int pos;
+ motTreeItemData *itemDataPrev;
- XtVaGetValues(wItemPrev, XmNentryParent, &wItemParent, NULL);
- XtVaGetValues(wItemPrev, XmNpositionIndex, &pos, NULL);
+ /* Get the kind of previous item */
+ XtVaGetValues(wItemPrev, XmNuserData, &itemDataPrev, NULL);
+ kindPrev = itemDataPrev->kind;
+
+ if (kindPrev == ITREE_BRANCH && add)
+ {
+ /* wItemPrev is parent of the new item (firstchild of it) */
+ iupMOT_SETARG(args, num_args, XmNentryParent, wItemPrev);
+ iupMOT_SETARG(args, num_args, XmNpositionIndex, 0);
+ }
+ else
+ {
+ /* wItemPrev is sibling of the new item (set its parent to the new item) */
+ Widget wItemParent;
+ int pos;
- iupmotSetArg(args, num_args, XmNentryParent, wItemParent);
- iupmotSetArg(args, num_args, XmNpositionIndex, pos+1);
+ XtVaGetValues(wItemPrev, XmNentryParent, &wItemParent, NULL);
+ XtVaGetValues(wItemPrev, XmNpositionIndex, &pos, NULL);
+
+ iupMOT_SETARG(args, num_args, XmNentryParent, wItemParent);
+ iupMOT_SETARG(args, num_args, XmNpositionIndex, pos+1);
+ }
}
- iupmotSetArg(args, num_args, XmNuserData, itemData);
- iupmotSetArg(args, num_args, XmNforeground, fgcolor);
- iupmotSetArg(args, num_args, XmNbackground, bgcolor);
- iupmotSetArg(args, num_args, XmNmarginHeight, ih->data->spacing);
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
- iupmotSetArg(args, num_args, XmNviewType, XmSMALL_ICON);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
- iupmotSetArg(args, num_args, XmNlabelString, itemTitle);
+ iupMOT_SETARG(args, num_args, XmNuserData, itemData);
+ iupMOT_SETARG(args, num_args, XmNforeground, fgcolor);
+ iupMOT_SETARG(args, num_args, XmNbackground, bgcolor);
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, ih->data->spacing);
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNviewType, XmSMALL_ICON);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNlabelString, itemTitle);
if (kind == ITREE_BRANCH)
{
if (ih->data->add_expanded)
{
- iupmotSetArg(args, num_args, XmNsmallIconPixmap, ih->data->def_image_expanded);
- iupmotSetArg(args, num_args, XmNsmallIconMask, ih->data->def_image_expanded_mask);
+ iupMOT_SETARG(args, num_args, XmNsmallIconPixmap, ih->data->def_image_expanded);
+ iupMOT_SETARG(args, num_args, XmNsmallIconMask, ih->data->def_image_expanded_mask);
}
else
{
- iupmotSetArg(args, num_args, XmNsmallIconPixmap, ih->data->def_image_collapsed);
- iupmotSetArg(args, num_args, XmNsmallIconMask, ih->data->def_image_collapsed_mask);
+ iupMOT_SETARG(args, num_args, XmNsmallIconPixmap, ih->data->def_image_collapsed);
+ iupMOT_SETARG(args, num_args, XmNsmallIconMask, ih->data->def_image_collapsed_mask);
}
}
else
{
- iupmotSetArg(args, num_args, XmNsmallIconPixmap, ih->data->def_image_leaf);
- iupmotSetArg(args, num_args, XmNsmallIconMask, ih->data->def_image_leaf_mask);
+ iupMOT_SETARG(args, num_args, XmNsmallIconPixmap, ih->data->def_image_leaf);
+ iupMOT_SETARG(args, num_args, XmNsmallIconMask, ih->data->def_image_leaf_mask);
}
+ /* Add the new node */
+ wItemNew = XtCreateManagedWidget("icon", xmIconGadgetClass, ih->handle, args, num_args);
+ if (wItemPrev)
+ iupTreeAddToCache(ih, add, kindPrev, wItemPrev, wItemNew);
+ else
+ {
+ iupTreeAddToCache(ih, 0, 0, NULL, wItemNew);
+
+ if (ih->data->node_count == 1)
+ {
+ /* MarkStart node */
+ iupAttribSetStr(ih, "_IUPTREE_MARKSTART_NODE", (char*)wItemNew);
- wNewItem = XtCreateManagedWidget("icon", xmIconGadgetClass, ih->handle, args, num_args);
+ /* Set the default VALUE */
+ motTreeSetFocusNode(ih, wItemNew);
+ }
+ }
if (kind == ITREE_BRANCH)
{
+ iupAttribSetStr(ih, "_IUP_IGNORE_BRANCH_CB", "1");
if (ih->data->add_expanded)
- {
- iupAttribSetStr(ih, "_IUP_IGNORE_BRANCHOPEN", "1");
- XtVaSetValues(wNewItem, XmNoutlineState, XmEXPANDED, NULL);
- }
+ XtVaSetValues(wItemNew, XmNoutlineState, XmEXPANDED, NULL);
else
- XtVaSetValues(wNewItem, XmNoutlineState, XmCOLLAPSED, NULL);
+ XtVaSetValues(wItemNew, XmNoutlineState, XmCOLLAPSED, NULL);
+ iupAttribSetStr(ih, "_IUP_IGNORE_BRANCH_CB", NULL);
}
- /* Root always expanded */
- XtVaSetValues((Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM"), XmNoutlineState, XmEXPANDED, NULL);
-
- XtRealizeWidget(wNewItem);
+ XtRealizeWidget(wItemNew);
XmStringFree(itemTitle);
}
-static void motTreeAddRootNode(Ihandle* ih)
-{
- Widget wRootItem;
- motTreeItemData *itemData;
- Pixel bgcolor, fgcolor;
- int num_args = 0;
- Arg args[30];
-
- itemData = calloc(1, sizeof(motTreeItemData));
- itemData->image = XmUNSPECIFIED_PIXMAP;
- itemData->image_expanded = XmUNSPECIFIED_PIXMAP;
- itemData->image_mask = XmUNSPECIFIED_PIXMAP;
- itemData->image_expanded_mask = XmUNSPECIFIED_PIXMAP;
- itemData->kind = ITREE_BRANCH;
-
- /* Get default foreground color */
- XtVaGetValues(ih->handle, XmNforeground, &fgcolor, NULL);
- XtVaGetValues(ih->handle, XmNbackground, &bgcolor, NULL);
-
- iupmotSetArg(args, num_args, XmNentryParent, NULL);
- iupmotSetArg(args, num_args, XmNuserData, itemData);
- iupmotSetArg(args, num_args, XmNforeground, fgcolor);
- iupmotSetArg(args, num_args, XmNbackground, bgcolor);
- iupmotSetArg(args, num_args, XmNoutlineState, XmEXPANDED);
- iupmotSetArg(args, num_args, XmNmarginHeight, ih->data->spacing);
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
- iupmotSetArg(args, num_args, XmNviewType, XmSMALL_ICON);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
- iupmotSetArg(args, num_args, XmNsmallIconPixmap, ih->data->def_image_expanded);
- iupmotSetArg(args, num_args, XmNsmallIconMask, ih->data->def_image_expanded_mask);
-
- wRootItem = XtCreateManagedWidget("icon", xmIconGadgetClass, ih->handle, args, num_args);
-
- /* Select the new item */
- XtVaSetValues(wRootItem, XmNvisualEmphasis, XmSELECTED, NULL);
-
- XtRealizeWidget(wRootItem);
-
- /* Save the root node for later use */
- iupAttribSetStr(ih, "_IUPTREE_ROOTITEM", (char*)wRootItem);
-
- /* MarkStart node */
- iupAttribSetStr(ih, "_IUPTREE_MARKSTART_NODE", (char*)wRootItem);
-
- /* Set the default VALUE */
- /* In Motif this will set also the current focus */
- motTreeSetFocusNode(ih, wRootItem);
-}
-
/*****************************************************************************/
static int motTreeSetImageExpandedAttrib(Ihandle* ih, const char* name_id, const char* value)
{
motTreeItemData *itemData;
unsigned char itemState;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return 0;
@@ -1003,7 +786,7 @@ static int motTreeSetImageExpandedAttrib(Ihandle* ih, const char* name_id, const
static int motTreeSetImageAttrib(Ihandle* ih, const char* name_id, const char* value)
{
motTreeItemData *itemData;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return 0;
@@ -1053,7 +836,6 @@ static int motTreeSetImageAttrib(Ihandle* ih, const char* name_id, const char* v
static int motTreeSetImageBranchExpandedAttrib(Ihandle* ih, const char* value)
{
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
ih->data->def_image_expanded = iupImageGetImage(value, ih, 0);
if (!ih->data->def_image_expanded)
{
@@ -1067,14 +849,13 @@ static int motTreeSetImageBranchExpandedAttrib(Ihandle* ih, const char* value)
}
/* Update all images, starting at root node */
- motTreeUpdateImages(ih, &wRoot, 1, ITREE_UPDATEIMAGE_EXPANDED);
+ motTreeUpdateImages(ih, ITREE_UPDATEIMAGE_EXPANDED);
return 1;
}
static int motTreeSetImageBranchCollapsedAttrib(Ihandle* ih, const char* value)
{
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
ih->data->def_image_collapsed = iupImageGetImage(value, ih, 0);
if (!ih->data->def_image_collapsed)
{
@@ -1088,14 +869,13 @@ static int motTreeSetImageBranchCollapsedAttrib(Ihandle* ih, const char* value)
}
/* Update all images, starting at root node */
- motTreeUpdateImages(ih, &wRoot, 1, ITREE_UPDATEIMAGE_COLLAPSED);
+ motTreeUpdateImages(ih, ITREE_UPDATEIMAGE_COLLAPSED);
return 1;
}
static int motTreeSetImageLeafAttrib(Ihandle* ih, const char* value)
{
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
ih->data->def_image_leaf = iupImageGetImage(value, ih, 0);
if (!ih->data->def_image_leaf)
{
@@ -1109,7 +889,7 @@ static int motTreeSetImageLeafAttrib(Ihandle* ih, const char* value)
}
/* Update all images, starting at root node */
- motTreeUpdateImages(ih, &wRoot, 1, ITREE_UPDATEIMAGE_LEAF);
+ motTreeUpdateImages(ih, ITREE_UPDATEIMAGE_LEAF);
return 1;
}
@@ -1118,7 +898,7 @@ static char* motTreeGetStateAttrib(Ihandle* ih, const char* name_id)
{
int hasChildren;
unsigned char itemState;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return 0;
@@ -1138,14 +918,21 @@ static char* motTreeGetStateAttrib(Ihandle* ih, const char* name_id)
static int motTreeSetStateAttrib(Ihandle* ih, const char* name_id, const char* value)
{
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
- if (!wItem)
+ motTreeItemData *itemData;
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
+ if (!wItem)
return 0;
- if (iupStrEqualNoCase(value, "EXPANDED"))
- XtVaSetValues(wItem, XmNoutlineState, XmEXPANDED, NULL);
- else
- XtVaSetValues(wItem, XmNoutlineState, XmCOLLAPSED, NULL);
+ XtVaGetValues(wItem, XmNuserData, &itemData, NULL);
+ if (itemData->kind == ITREE_BRANCH)
+ {
+ iupAttribSetStr(ih, "_IUP_IGNORE_BRANCH_CB", "1");
+ if (iupStrEqualNoCase(value, "EXPANDED"))
+ XtVaSetValues(wItem, XmNoutlineState, XmEXPANDED, NULL);
+ else
+ XtVaSetValues(wItem, XmNoutlineState, XmCOLLAPSED, NULL);
+ iupAttribSetStr(ih, "_IUP_IGNORE_BRANCH_CB", NULL);
+ }
return 0;
}
@@ -1155,7 +942,7 @@ static char* motTreeGetColorAttrib(Ihandle* ih, const char* name_id)
unsigned char r, g, b;
Pixel color;
char* str;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return NULL;
@@ -1170,7 +957,7 @@ static char* motTreeGetColorAttrib(Ihandle* ih, const char* name_id)
static int motTreeSetColorAttrib(Ihandle* ih, const char* name_id, const char* value)
{
Pixel color;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return 0;
@@ -1182,36 +969,33 @@ static int motTreeSetColorAttrib(Ihandle* ih, const char* name_id, const char* v
static char* motTreeGetDepthAttrib(Ihandle* ih, const char* name_id)
{
- Widget wRoot;
- int dep = 0;
- char* depth;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ int depth = -1;
+ char* str;
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return NULL;
- wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
-
- while((wRoot != wItem) && (wItem != NULL))
+ while(wItem != NULL)
{
XtVaGetValues(wItem, XmNentryParent, &wItem, NULL);
- dep++;
+ depth++;
}
- depth = iupStrGetMemory(10);
- sprintf(depth, "%d", dep);
- return depth;
+ str = iupStrGetMemory(10);
+ sprintf(str, "%d", depth);
+ return str;
}
static int motTreeSetMoveNodeAttrib(Ihandle* ih, const char* name_id, const char* value)
{
Widget wItemDst, wParent, wItemSrc;
- if (!ih->handle) /* do not store the action before map */
+ if (!ih->handle) /* do not do the action before map */
return 0;
- wItemSrc = motTreeFindNodeFromString(ih, name_id);
+ wItemSrc = iupTreeGetNodeFromString(ih, name_id);
if (!wItemSrc)
return 0;
- wItemDst = motTreeFindNodeFromString(ih, value);
+ wItemDst = iupTreeGetNodeFromString(ih, value);
if (!wItemDst)
return 0;
@@ -1224,11 +1008,8 @@ static int motTreeSetMoveNodeAttrib(Ihandle* ih, const char* name_id, const char
return 0;
}
- /* Copying the node and its children to the new position */
- motTreeCopyNode(ih, wItemSrc, wItemDst, 0); /* not a full copy, preserve user data */
-
- /* Deleting the node (and its children) inserted into the old position */
- motTreeRemoveNode(ih, wItemSrc, 0); /* do not delete the user data, we copy the references in CopyNode */
+ /* Move the node and its children to the new position */
+ motTreeCopyMoveNode(ih, wItemSrc, wItemDst, 0);
return 0;
}
@@ -1237,12 +1018,12 @@ static int motTreeSetCopyNodeAttrib(Ihandle* ih, const char* name_id, const char
{
Widget wItemDst, wParent, wItemSrc;
- if (!ih->handle) /* do not store the action before map */
+ if (!ih->handle) /* do not do the action before map */
return 0;
- wItemSrc = motTreeFindNodeFromString(ih, name_id);
+ wItemSrc = iupTreeGetNodeFromString(ih, name_id);
if (!wItemSrc)
return 0;
- wItemDst = motTreeFindNodeFromString(ih, value);
+ wItemDst = iupTreeGetNodeFromString(ih, value);
if (!wItemDst)
return 0;
@@ -1255,8 +1036,8 @@ static int motTreeSetCopyNodeAttrib(Ihandle* ih, const char* name_id, const char
return 0;
}
- /* Copying the node and its children to the new position */
- motTreeCopyNode(ih, wItemSrc, wItemDst, 1);
+ /* Copy the node and its children to the new position */
+ motTreeCopyMoveNode(ih, wItemSrc, wItemDst, 1);
return 0;
}
@@ -1265,7 +1046,7 @@ static char* motTreeGetParentAttrib(Ihandle* ih, const char* name_id)
{
Widget wItemParent;
char* str;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return NULL;
@@ -1275,7 +1056,7 @@ static char* motTreeGetParentAttrib(Ihandle* ih, const char* name_id)
return NULL;
str = iupStrGetMemory(10);
- sprintf(str, "%d", motTreeGetNodeId(ih, wItemParent));
+ sprintf(str, "%d", iupTreeFindNodeId(ih, wItemParent));
return str;
}
@@ -1283,7 +1064,7 @@ static char* motTreeGetChildCountAttrib(Ihandle* ih, const char* name_id)
{
char* str;
WidgetList wList = NULL;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return NULL;
@@ -1293,30 +1074,10 @@ static char* motTreeGetChildCountAttrib(Ihandle* ih, const char* name_id)
return str;
}
-static int motTreeCount(Ihandle* ih, Widget wItem)
-{
- WidgetList wList = NULL;
- int i, count = 0;
- int childCount = XmContainerGetItemChildren(ih->handle, wItem, &wList);
- count++;
- for (i=0; i<childCount; i++)
- count += motTreeCount(ih, wList[i]);
- if (wList) XtFree((char*)wList);
- return count;
-}
-
-static char* motTreeGetCountAttrib(Ihandle* ih)
-{
- char* str = iupStrGetMemory(10);
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
- sprintf(str, "%d", motTreeCount(ih, wRoot));
- return str;
-}
-
static char* motTreeGetKindAttrib(Ihandle* ih, const char* name_id)
{
motTreeItemData *itemData;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return NULL;
@@ -1331,15 +1092,64 @@ static char* motTreeGetKindAttrib(Ihandle* ih, const char* name_id)
static char* motTreeGetValueAttrib(Ihandle* ih)
{
char* str;
- Widget wItem = motTreeGetFocusNode(ih);
+ Widget wItem = iupdrvTreeGetFocusNode(ih);
if (!wItem)
- return "0"; /* default VALUE is root */
+ {
+ if (ih->data->node_count)
+ return "0"; /* default VALUE is root */
+ else
+ return "-1";
+ }
str = iupStrGetMemory(10);
- sprintf(str, "%d", motTreeGetNodeId(ih, wItem));
+ sprintf(str, "%d", iupTreeFindNodeId(ih, wItem));
+ return str;
+}
+
+static char* motTreeGetMarkedNodesAttrib(Ihandle* ih)
+{
+ char* str;
+ int i;
+
+ if (ih->data->mark_mode==ITREE_MARK_SINGLE)
+ return NULL;
+
+ str = iupStrGetMemory(ih->data->node_count+1);
+
+ for (i=0; i<ih->data->node_count; i++)
+ {
+ if (motTreeIsNodeSelected(ih->data->node_cache[i].node_handle))
+ str[i] = '+';
+ else
+ str[i] = '-';
+ }
+
+ str[ih->data->node_count] = 0;
return str;
}
+static int motTreeSetMarkedNodesAttrib(Ihandle* ih, const char* value)
+{
+ int count, i;
+
+ if (ih->data->mark_mode==ITREE_MARK_SINGLE || !value)
+ return 0;
+
+ count = strlen(value);
+ if (count > ih->data->node_count)
+ count = ih->data->node_count;
+
+ for (i=0; i<count; i++)
+ {
+ if (value[i] == '+')
+ XtVaSetValues(ih->data->node_cache[i].node_handle, XmNvisualEmphasis, XmSELECTED, NULL);
+ else
+ XtVaSetValues(ih->data->node_cache[i].node_handle, XmNvisualEmphasis, XmNOT_SELECTED, NULL);
+ }
+
+ return 0;
+}
+
static int motTreeSetMarkAttrib(Ihandle* ih, const char* value)
{
if (ih->data->mark_mode==ITREE_MARK_SINGLE)
@@ -1353,21 +1163,16 @@ static int motTreeSetMarkAttrib(Ihandle* ih, const char* value)
motTreeInvertAllNodeMarking(ih);
else if(iupStrEqualPartial(value, "INVERT"))
{
- unsigned char isSelected;
- Widget wItem = motTreeFindNodeFromString(ih, &value[strlen("INVERT")]);
+ Widget wItem = iupTreeGetNodeFromString(ih, &value[strlen("INVERT")]);
if (!wItem)
return 0;
- XtVaGetValues(wItem, XmNvisualEmphasis, &isSelected, NULL);
- if (isSelected == XmSELECTED)
- XtVaSetValues(wItem, XmNvisualEmphasis, XmNOT_SELECTED, NULL);
- else
- XtVaSetValues(wItem, XmNvisualEmphasis, XmSELECTED, NULL);
+ motTreeSelectNode(wItem, -1);
}
else if(iupStrEqualNoCase(value, "BLOCK"))
{
Widget wItem = (Widget)iupAttribGet(ih, "_IUPTREE_MARKSTART_NODE");
- Widget wFocusItem = motTreeGetFocusNode(ih);
+ Widget wFocusItem = iupdrvTreeGetFocusNode(ih);
if(!wFocusItem || !wItem)
return 0;
motTreeSelectRange(ih, wFocusItem, wItem, 0);
@@ -1379,10 +1184,10 @@ static int motTreeSetMarkAttrib(Ihandle* ih, const char* value)
if (iupStrToStrStr(value, str1, str2, '-')!=2)
return 0;
- wItem1 = motTreeFindNodeFromString(ih, str1);
+ wItem1 = iupTreeGetNodeFromString(ih, str1);
if (!wItem1)
return 0;
- wItem2 = motTreeFindNodeFromString(ih, str2);
+ wItem2 = iupTreeGetNodeFromString(ih, str2);
if (!wItem2)
return 0;
@@ -1394,69 +1199,49 @@ static int motTreeSetMarkAttrib(Ihandle* ih, const char* value)
static int motTreeSetValueAttrib(Ihandle* ih, const char* value)
{
- Widget wRoot, wItem;
+ Widget wItem, wItemParent;
if (motTreeSetMarkAttrib(ih, value))
return 0;
- wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
-
- if (iupStrEqualNoCase(value, "ROOT"))
- wItem = wRoot;
+ if (iupStrEqualNoCase(value, "ROOT") || iupStrEqualNoCase(value, "FIRST"))
+ wItem = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
else if(iupStrEqualNoCase(value, "LAST"))
- wItem = motTreeGetLastVisibleNode(ih, wRoot);
+ wItem = motTreeGetLastVisibleNode(ih);
else if(iupStrEqualNoCase(value, "PGUP"))
{
- Widget wItemFocus = motTreeGetFocusNode(ih);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
if(!wItemFocus)
return 0;
- ih->data->id_control = -1;
- motTreeFindVisibleNodeId(ih, &wRoot, 1, wItemFocus);
- ih->data->id_control -= 10; /* less 10 visible nodes */
-
- if(ih->data->id_control < 0)
- ih->data->id_control = 0; /* Begin of tree = Root id */
-
- wItem = motTreeFindVisibleNodeFromId(ih, &wRoot, 1);
+ wItem = motTreeGetPreviousVisibleNode(ih, wItemFocus, 10);
}
else if(iupStrEqualNoCase(value, "PGDN"))
{
- Widget wNext, wItemFocus;
-
- wItemFocus = motTreeGetFocusNode(ih);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
if(!wItemFocus)
return 0;
- ih->data->id_control = -1;
- motTreeFindVisibleNodeId(ih, &wRoot, 1, wItemFocus);
- ih->data->id_control += 10; /* more 10 visible nodes */
-
- wNext = motTreeFindVisibleNodeFromId(ih, &wRoot, 1);
-
- if (ih->data->id_control >= 0)
- wNext = motTreeGetLastVisibleNode(ih, wRoot);
-
- wItem = wNext;
+ wItem = motTreeGetNextVisibleNode(ih, wItemFocus, 10);
}
else if(iupStrEqualNoCase(value, "NEXT"))
{
- Widget wItemFocus = motTreeGetFocusNode(ih);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
if (!wItemFocus)
return 0;
- wItem = motTreeGetNextVisibleNode(ih, wRoot, wItemFocus);
+ wItem = motTreeGetNextVisibleNode(ih, wItemFocus, 1);
}
else if(iupStrEqualNoCase(value, "PREVIOUS"))
{
- Widget wItemFocus = motTreeGetFocusNode(ih);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
if(!wItemFocus)
return 0;
- wItem = motTreeGetPreviousVisibleNode(ih, wRoot, wItemFocus);
+ wItem = motTreeGetPreviousVisibleNode(ih, wItemFocus, 1);
}
else
- wItem = motTreeFindNodeFromString(ih, value);
+ wItem = iupTreeGetNodeFromString(ih, value);
if (!wItem)
return 0;
@@ -1471,17 +1256,26 @@ static int motTreeSetValueAttrib(Ihandle* ih, const char* value)
XtVaSetValues(wItem, XmNvisualEmphasis, XmSELECTED, NULL);
}
+
+ /* expand all parents */
+ XtVaGetValues(wItem, XmNentryParent, &wItemParent, NULL);
+ while(wItemParent)
+ {
+ XtVaSetValues(wItemParent, XmNoutlineState, XmEXPANDED, NULL);
+ XtVaGetValues(wItemParent, XmNentryParent, &wItemParent, NULL);
+ }
+
/* set focus (will scroll to visible) */
motTreeSetFocusNode(ih, wItem);
- iupAttribSetInt(ih, "_IUPTREE_OLDVALUE", motTreeGetNodeId(ih, wItem));
+ iupAttribSetInt(ih, "_IUPTREE_OLDVALUE", iupTreeFindNodeId(ih, wItem));
return 0;
}
static int motTreeSetMarkStartAttrib(Ihandle* ih, const char* name_id)
{
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return 0;
@@ -1492,14 +1286,11 @@ static int motTreeSetMarkStartAttrib(Ihandle* ih, const char* name_id)
static char* motTreeGetMarkedAttrib(Ihandle* ih, const char* name_id)
{
- unsigned char isSelected;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return NULL;
- XtVaGetValues(wItem, XmNvisualEmphasis, &isSelected, NULL);
-
- if(isSelected == XmSELECTED)
+ if (motTreeIsNodeSelected(wItem))
return "YES";
else
return "NO";
@@ -1507,7 +1298,7 @@ static char* motTreeGetMarkedAttrib(Ihandle* ih, const char* name_id)
static int motTreeSetMarkedAttrib(Ihandle* ih, const char* name_id, const char* value)
{
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return 0;
@@ -1531,7 +1322,7 @@ static char* motTreeGetTitle(Widget wItem)
static char* motTreeGetTitleAttrib(Ihandle* ih, const char* name_id)
{
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return NULL;
return motTreeGetTitle(wItem);
@@ -1539,10 +1330,13 @@ static char* motTreeGetTitleAttrib(Ihandle* ih, const char* name_id)
static int motTreeSetTitleAttrib(Ihandle* ih, const char* name_id, const char* value)
{
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return 0;
+ if (!value)
+ value = "";
+
iupmotSetString(wItem, XmNlabelString, value);
return 0;
@@ -1551,7 +1345,7 @@ static int motTreeSetTitleAttrib(Ihandle* ih, const char* name_id, const char* v
static int motTreeSetTitleFontAttrib(Ihandle* ih, const char* name_id, const char* value)
{
XmFontList fontlist = NULL;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return 0;
@@ -1569,7 +1363,7 @@ static int motTreeSetTitleFontAttrib(Ihandle* ih, const char* name_id, const cha
static char* motTreeGetTitleFontAttrib(Ihandle* ih, const char* name_id)
{
XmFontList fontlist;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if (!wItem)
return NULL;
@@ -1577,118 +1371,81 @@ static char* motTreeGetTitleFontAttrib(Ihandle* ih, const char* name_id)
return iupmotFindFontList(fontlist);
}
-static char* motTreeGetFindUserDataAttrib(Ihandle* ih, const char* name_id)
-{
- int id;
- char* str = (char*)(name_id+1); /* skip ':' */
- void* userdata = NULL;
- if (sscanf(str, "%p", &userdata)!=1)
- return NULL;
- id = motTreeGetUserDataId(ih, userdata);
- if (id == -1)
- return NULL;
- str = iupStrGetMemory(16);
- sprintf(str, "%d", id);
- return str;
-}
-
-static char* motTreeGetUserDataAttrib(Ihandle* ih, const char* name_id)
-{
- motTreeItemData *itemData;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
- if (!wItem)
- return NULL;
-
- XtVaGetValues(wItem, XmNuserData, &itemData, NULL);
-
- return itemData->userdata;
-}
-
-static int motTreeSetUserDataAttrib(Ihandle* ih, const char* name_id, const char* value)
-{
- motTreeItemData *itemData;
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
- if (!wItem)
- return 0;
-
- XtVaGetValues(wItem, XmNuserData, &itemData, NULL);
- itemData->userdata = (void*)value;
-
- return 0;
-}
-
static int motTreeSetRenameAttrib(Ihandle* ih, const char* value)
{
if (ih->data->show_rename)
{
- IFni cbShowRename = (IFni)IupGetCallback(ih, "SHOWRENAME_CB");
- Widget wItemFocus = motTreeGetFocusNode(ih);
- if (cbShowRename)
- cbShowRename(ih, motTreeGetNodeId(ih, wItemFocus));
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
motTreeShowEditField(ih, wItemFocus);
}
- else
- {
- IFnis cbRenameNode = (IFnis)IupGetCallback(ih, "RENAMENODE_CB");
- if (cbRenameNode)
- {
- Widget wItemFocus = motTreeGetFocusNode(ih);
- cbRenameNode(ih, motTreeGetNodeId(ih, wItemFocus), motTreeGetTitle(wItemFocus));
- }
- }
(void)value;
return 0;
}
+static void motTreeRemoveAllNodes(Ihandle* ih, int call_cb)
+{
+ IFns cb = call_cb? (IFns)IupGetCallback(ih, "NODEREMOVED_CB"): NULL;
+ int i, old_count = ih->data->node_count;
+ Widget wItem;
+
+ for (i = 0; i < ih->data->node_count; i++)
+ {
+ wItem = ih->data->node_cache[i].node_handle;
+
+ motTreeDestroyItemData(ih, wItem, 1, cb, i);
+
+ XtDestroyWidget(wItem); /* must manually destroy each node, this is NOT recursive */
+ }
+
+ ih->data->node_count = 0;
+
+ if (call_cb)
+ iupTreeDelFromCache(ih, 0, old_count);
+}
+
static int motTreeSetDelNodeAttrib(Ihandle* ih, const char* name_id, const char* value)
{
- if (!ih->handle) /* do not store the action before map */
+ if (!ih->handle) /* do not do the action before map */
return 0;
- if(iupStrEqualNoCase(value, "SELECTED")) /* selected here means the specified one */
+ if (iupStrEqualNoCase(value, "ALL"))
{
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
-
- /* the root node can't be deleted */
- if(!wItem || wItem == wRoot) /* root is the unique child */
+ motTreeRemoveAllNodes(ih, 1);
+ return 0;
+ }
+ if(iupStrEqualNoCase(value, "SELECTED")) /* selected here means the reference node */
+ {
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
+ if(!wItem)
return 0;
- /* deleting the specified node (and it's children) */
- motTreeRemoveNode(ih, wItem, 1);
+ /* deleting the reference node (and it's children) */
+ motTreeRemoveNode(ih, wItem, 1, 1);
}
- else if(iupStrEqualNoCase(value, "CHILDREN")) /* children of the specified one */
+ else if(iupStrEqualNoCase(value, "CHILDREN")) /* children of the reference node */
{
- Widget wItem = motTreeFindNodeFromString(ih, name_id);
+ int numChild, i;
+ WidgetList wItemList = NULL;
+ Widget wItem = iupTreeGetNodeFromString(ih, name_id);
if(!wItem)
return 0;
- {
- /* deleting the selected node's children only */
- WidgetList wItemList = NULL;
- int numChild = XmContainerGetItemChildren(ih->handle, wItem, &wItemList);
- if(numChild)
- motTreeRemoveChildren(ih, wItemList, numChild, 1);
- if (wItemList) XtFree((char*)wItemList);
- }
+ /* deleting the reference node children only */
+ numChild = XmContainerGetItemChildren(ih->handle, wItem, &wItemList);
+ for(i = 0; i < numChild; i++)
+ motTreeRemoveNode(ih, wItemList[i], 1, 1);
+ if (wItemList) XtFree((char*)wItemList);
}
else if(iupStrEqualNoCase(value, "MARKED")) /* Delete the array of marked nodes */
{
- WidgetList wSelectedItemList = NULL;
- Widget wRoot;
- int countItems, i;
-
- XtVaGetValues(ih->handle, XmNselectedObjects, &wSelectedItemList,
- XmNselectedObjectCount, &countItems, NULL);
-
- wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
-
- for(i = 0; i < countItems; i++)
+ int i;
+ for(i = 1; i < ih->data->node_count; /* increment only if not removed */)
{
- int ok = XmIsIconGadget(wSelectedItemList[i]);
- if ((wSelectedItemList[i] != wRoot) && ok) /* the root node can't be deleted */
- motTreeRemoveNode(ih, wSelectedItemList[i], 1);
+ if (motTreeIsNodeSelected(ih->data->node_cache[i].node_handle))
+ motTreeRemoveNode(ih, ih->data->node_cache[i].node_handle, 1, 1);
+ else
+ i++;
}
}
@@ -1714,7 +1471,7 @@ static int motTreeSetIndentationAttrib(Ihandle* ih, const char* value)
static int motTreeSetTopItemAttrib(Ihandle* ih, const char* value)
{
- Widget wItem = motTreeFindNodeFromString(ih, value);
+ Widget wItem = iupTreeGetNodeFromString(ih, value);
Widget sb_win;
Widget wItemParent;
@@ -1735,10 +1492,11 @@ static int motTreeSetTopItemAttrib(Ihandle* ih, const char* value)
return 0;
}
-static int motTreeSpacingFunc(Ihandle* ih, Widget wItem, void *data)
+static int motTreeSpacingFunc(Ihandle* ih, Widget wItem, int id, void *data)
{
XtVaSetValues(wItem, XmNmarginHeight, ih->data->spacing, NULL);
(void)data;
+ (void)id;
return 1;
}
@@ -1752,7 +1510,7 @@ static int motTreeSetSpacingAttrib(Ihandle* ih, const char* value)
if (ih->handle)
{
- motTreeForEach(ih, NULL, (motTreeNodeFunc)motTreeSpacingFunc, 0);
+ iupTreeForEach(ih, (iupTreeNodeFunc)motTreeSpacingFunc, 0);
return 0;
}
else
@@ -1761,17 +1519,10 @@ static int motTreeSetSpacingAttrib(Ihandle* ih, const char* value)
static int motTreeSetExpandAllAttrib(Ihandle* ih, const char* value)
{
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
-
if (iupStrBoolean(value))
- motTreeExpandCollapseAllNodes(ih, &wRoot, 1, XmEXPANDED);
+ motTreeExpandCollapseAllNodes(ih, XmEXPANDED);
else
- {
- motTreeExpandCollapseAllNodes(ih, &wRoot, 1, XmCOLLAPSED);
-
- /* The root node is always expanded */
- XtVaSetValues((Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM"), XmNoutlineState, XmEXPANDED, NULL);
- }
+ motTreeExpandCollapseAllNodes(ih, XmCOLLAPSED);
return 0;
}
@@ -1801,16 +1552,13 @@ static int motTreeSetBgColorAttrib(Ihandle* ih, const char* value)
color = iupmotColorGetPixelStr(value);
if (color != (Pixel)-1)
{
- Widget wRoot;
Widget clipwin = NULL;
XtVaGetValues(sb_win, XmNclipWindow, &clipwin, NULL);
if (clipwin) iupmotSetBgColor(clipwin, color);
- wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
-
/* Update all children, starting at root node */
- motTreeUpdateBgColor(ih, &wRoot, 1, color);
+ motTreeUpdateBgColor(ih, color);
}
iupdrvBaseSetBgColorAttrib(ih, value); /* use given value for contents */
@@ -1871,10 +1619,14 @@ static void motTreeSetRenameSelectionPos(Widget cbEdit, const char* value)
static int motTreeCallBranchCloseCb(Ihandle* ih, Widget wItem)
{
- IFni cbBranchClose = (IFni)IupGetCallback(ih, "BRANCHCLOSE_CB");
+ IFni cbBranchClose;
+
+ if (iupAttribGet(ih, "_IUP_IGNORE_BRANCH_CB"))
+ return IUP_DEFAULT;
- if(cbBranchClose)
- return cbBranchClose(ih, motTreeGetNodeId(ih, wItem));
+ cbBranchClose = (IFni)IupGetCallback(ih, "BRANCHCLOSE_CB");
+ if (cbBranchClose)
+ return cbBranchClose(ih, iupTreeFindNodeId(ih, wItem));
return IUP_DEFAULT;
}
@@ -1883,59 +1635,136 @@ static int motTreeCallBranchOpenCb(Ihandle* ih, Widget wItem)
{
IFni cbBranchOpen;
- if (iupAttribGet(ih, "_IUP_IGNORE_BRANCHOPEN"))
- {
- iupAttribSetStr(ih, "_IUP_IGNORE_BRANCHOPEN", NULL);
+ if (iupAttribGet(ih, "_IUP_IGNORE_BRANCH_CB"))
return IUP_DEFAULT;
- }
cbBranchOpen = (IFni)IupGetCallback(ih, "BRANCHOPEN_CB");
if (cbBranchOpen)
- return cbBranchOpen(ih, motTreeGetNodeId(ih, wItem));
+ return cbBranchOpen(ih, iupTreeFindNodeId(ih, wItem));
return IUP_DEFAULT;
}
+static void motTreeFindRange(Ihandle* ih, WidgetList wSelectedItemList, int countItems, int *id1, int *id2)
+{
+ int i = 0, id;
+
+ *id1 = ih->data->node_count;
+ *id2 = -1;
+
+ for(i = 0; i < countItems; i++)
+ {
+ int is_icon = XmIsIconGadget(wSelectedItemList[i]); /* this line generates a warning in some compilers */
+ if (is_icon)
+ {
+ id = iupTreeFindNodeId(ih, wSelectedItemList[i]);
+ if (id < *id1)
+ *id1 = id;
+ if (id > *id2)
+ *id2 = id;
+ }
+ }
+
+ /* interactive selection of several nodes will NOT select hidden nodes,
+ so make sure that they are selected. */
+ for(i = *id1; i <= *id2; i++)
+ {
+ if (!motTreeIsNodeSelected(ih->data->node_cache[i].node_handle))
+ XtVaSetValues(ih->data->node_cache[i].node_handle, XmNvisualEmphasis, XmSELECTED, NULL);
+ }
+
+ /* if last selected item is a branch, then select its children */
+ iupTreeSelectLastCollapsedBranch(ih, id2);
+}
+
+static Iarray* motTreeGetSelectedArrayId(Ihandle* ih, WidgetList wSelectedItemList, int countItems)
+{
+ Iarray* selarray = iupArrayCreate(1, sizeof(int));
+ int i;
+
+ for(i = 0; i < countItems; i++)
+ {
+ int is_icon = XmIsIconGadget(wSelectedItemList[i]); /* this line generates a warning in some compilers */
+ if (is_icon)
+ {
+ int* id_hitem = (int*)iupArrayInc(selarray);
+ int j = iupArrayCount(selarray);
+ id_hitem[j-1] = iupTreeFindNodeId(ih, wSelectedItemList[i]);
+ }
+ }
+
+ return selarray;
+}
+
+static void motTreeCallMultiUnSelectionCb(Ihandle* ih)
+{
+ IFnIi cbMulti = (IFnIi)IupGetCallback(ih, "MULTIUNSELECTION_CB");
+ IFnii cbSelec = (IFnii)IupGetCallback(ih, "SELECTION_CB");
+ if (cbSelec || cbMulti)
+ {
+ WidgetList wSelectedItemList = NULL;
+ int countItems = 0;
+
+ XtVaGetValues(ih->handle, XmNselectedObjects, &wSelectedItemList,
+ XmNselectedObjectCount, &countItems, NULL);
+ if (countItems > 1)
+ {
+ Iarray* markedArray = motTreeGetSelectedArrayId(ih, wSelectedItemList, countItems);
+ int* id_hitem = (int*)iupArrayGetData(markedArray);
+ int i, count = iupArrayCount(markedArray);
+
+ if (cbMulti)
+ cbMulti(ih, id_hitem, iupArrayCount(markedArray));
+ else
+ {
+ for (i=0; i<count; i++)
+ cbSelec(ih, id_hitem[i], 0);
+ }
+
+ iupArrayDestroy(markedArray);
+ }
+ }
+}
+
static void motTreeCallMultiSelectionCb(Ihandle* ih)
{
IFnIi cbMulti = (IFnIi)IupGetCallback(ih, "MULTISELECTION_CB");
IFnii cbSelec = (IFnii)IupGetCallback(ih, "SELECTION_CB");
WidgetList wSelectedItemList = NULL;
- Widget wRoot;
- int countItems;
-
- wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
+ int countItems, id1, id2, i;
XtVaGetValues(ih->handle, XmNselectedObjects, &wSelectedItemList,
XmNselectedObjectCount, &countItems, NULL);
if (countItems == 0)
return;
- if (cbMulti || cbSelec)
+ /* Must be a continuous range of selection ids */
+ motTreeFindRange(ih, wSelectedItemList, countItems, &id1, &id2);
+ countItems = id2-id1+1;
+
+ if (cbMulti)
{
int* id_rowItem = malloc(sizeof(int) * countItems);
- int i = 0;
for(i = 0; i < countItems; i++)
- id_rowItem[i] = motTreeGetNodeId(ih, wSelectedItemList[i]);
+ id_rowItem[i] = id1+i;
- if (cbMulti)
- cbMulti(ih, id_rowItem, countItems);
- else
- {
- for (i=0; i<countItems; i++)
- cbSelec(ih, id_rowItem[i], 1);
- }
+ cbMulti(ih, id_rowItem, countItems);
free(id_rowItem);
}
+ else if (cbSelec)
+ {
+ for (i=0; i<countItems; i++)
+ cbSelec(ih, id1+i, 1);
+ }
}
static int motTreeConvertXYToPos(Ihandle* ih, int x, int y)
{
Widget wItem = XmObjectAtPoint(ih->handle, (Position)x, (Position)y);
if (wItem)
- return motTreeGetNodeId(ih, wItem);
+ return iupTreeFindNodeId(ih, wItem);
return -1;
}
@@ -1965,7 +1794,7 @@ static void motTreeCallRenameCb(Ihandle* ih)
cbRename = (IFnis)IupGetCallback(ih, "RENAME_CB");
if (cbRename)
{
- if (cbRename(ih, motTreeGetNodeId(ih, wItem), title) == IUP_IGNORE)
+ if (cbRename(ih, iupTreeFindNodeId(ih, wItem), title) == IUP_IGNORE)
ignore = 1;
}
@@ -1993,8 +1822,8 @@ static int motTreeCallDragDropCb(Ihandle* ih, Widget wItemDrag, Widget wItemDrop
if (cbDragDrop)
{
- int drag_id = motTreeGetNodeId(ih, wItemDrag);
- int drop_id = motTreeGetNodeId(ih, wItemDrop);
+ int drag_id = iupTreeFindNodeId(ih, wItemDrag);
+ int drop_id = iupTreeFindNodeId(ih, wItemDrop);
return cbDragDrop(ih, drag_id, drop_id, is_shift, *is_ctrl);
}
@@ -2069,6 +1898,10 @@ static void motTreeShowEditField(Ihandle* ih, Widget wItem)
XmFontList fontlist;
Widget sb_win = (Widget)iupAttribGet(ih, "_IUP_EXTRAPARENT");
+ IFni cbShowRename = (IFni)IupGetCallback(ih, "SHOWRENAME_CB");
+ if (cbShowRename && cbShowRename(ih, iupTreeFindNodeId(ih, wItem))==IUP_IGNORE)
+ return;
+
XtVaGetValues(wItem, XmNx, &x,
XmNy, &y,
XmNwidth, &w,
@@ -2083,16 +1916,16 @@ static void motTreeShowEditField(Ihandle* ih, Widget wItem)
iupdrvImageGetInfo((void*)image, &w_img, NULL, NULL);
w_img += 3; /* add some room for borders */
- iupmotSetArg(args, num_args, XmNx, x+w_img); /* x-position */
- iupmotSetArg(args, num_args, XmNy, y); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, w-w_img); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, h); /* default height to avoid 0 */
- iupmotSetArg(args, num_args, XmNmarginHeight, ih->data->spacing); /* default padding */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
- iupmotSetArg(args, num_args, XmNforeground, color);
- iupmotSetArg(args, num_args, XmNrenderTable, fontlist);
- iupmotSetArg(args, num_args, XmNvalue, iupmotConvertString(title));
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNx, x+w_img); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, y); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, w-w_img); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, h); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, ih->data->spacing); /* default padding */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNforeground, color);
+ iupMOT_SETARG(args, num_args, XmNrenderTable, fontlist);
+ iupMOT_SETARG(args, num_args, XmNvalue, iupmotConvertString(title));
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
cbEdit = XtCreateManagedWidget(
child_id, /* child identifier */
@@ -2134,8 +1967,6 @@ static void motTreeSelectionCallback(Widget w, Ihandle* ih, XmContainerSelectCal
(void)w;
(void)nptr;
-printf("SelectionCallback(%d)\n", nptr->selected_item_count);
-
if (ih->data->mark_mode == ITREE_MARK_MULTIPLE)
{
char key[5];
@@ -2149,11 +1980,13 @@ printf("SelectionCallback(%d)\n", nptr->selected_item_count);
{
if (IupGetCallback(ih, "MULTISELECTION_CB"))
{
+ /* current selection same as the initial selection */
if (nptr->auto_selection_type==XmAUTO_NO_CHANGE)
motTreeCallMultiSelectionCb(ih);
}
else
{
+ /* current selection is caused by button drag */
if (nptr->auto_selection_type==XmAUTO_MOTION)
motTreeCallMultiSelectionCb(ih);
}
@@ -2164,14 +1997,10 @@ printf("SelectionCallback(%d)\n", nptr->selected_item_count);
cbSelec = (IFnii)IupGetCallback(ih, "SELECTION_CB");
if (cbSelec)
{
- Widget wItemFocus = motTreeGetFocusNode(ih);
- int curpos = motTreeGetNodeId(ih, wItemFocus);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
+ int curpos = iupTreeFindNodeId(ih, wItemFocus);
if (is_ctrl)
- {
- unsigned char isSelected;
- XtVaGetValues(wItemFocus, XmNvisualEmphasis, &isSelected, NULL);
- cbSelec(ih, curpos, isSelected == XmSELECTED? 1: 0);
- }
+ cbSelec(ih, curpos, motTreeIsNodeSelected(wItemFocus));
else
{
int oldpos = iupAttribGetInt(ih, "_IUPTREE_OLDVALUE");
@@ -2218,7 +2047,7 @@ static void motTreeDefaultActionCallback(Widget w, Ihandle* ih, XmContainerSelec
{
IFni cbExecuteLeaf = (IFni)IupGetCallback(ih, "EXECUTELEAF_CB");
if (cbExecuteLeaf)
- cbExecuteLeaf(ih, motTreeGetNodeId(ih, wItem));
+ cbExecuteLeaf(ih, iupTreeFindNodeId(ih, wItem));
}
}
@@ -2295,15 +2124,14 @@ static void motTreeKeyPressEvent(Widget w, Ihandle *ih, XKeyEvent *evt, Boolean
iupmotHelpCallback(w, ih, NULL);
else if ((motcode == XK_Down || motcode == XK_Up) && (evt->state & ControlMask))
{
- Widget wRoot = (Widget)iupAttribGet(ih, "_IUPTREE_ROOTITEM");
Widget wItem;
- Widget wItemFocus = motTreeGetFocusNode(ih);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
/* Ctrl+Arrows move only focus */
if (motcode == XK_Down)
- wItem = motTreeGetNextVisibleNode(ih, wRoot, wItemFocus);
+ wItem = motTreeGetNextVisibleNode(ih, wItemFocus, 1);
else
- wItem = motTreeGetPreviousVisibleNode(ih, wRoot, wItemFocus);
+ wItem = motTreeGetPreviousVisibleNode(ih, wItemFocus, 1);
motTreeSetFocusNode(ih, wItem);
*cont = False;
@@ -2317,8 +2145,8 @@ static void motTreeKeyPressEvent(Widget w, Ihandle *ih, XKeyEvent *evt, Boolean
if (motcode == XK_Home)
wItem = wRoot;
- else
- wItem = motTreeGetLastVisibleNode(ih, wRoot);
+ else /* motcode == XK_End */
+ wItem = motTreeGetLastVisibleNode(ih);
/* Ctrl+Arrows move only focus */
if (!(evt->state & ControlMask))
@@ -2326,7 +2154,7 @@ static void motTreeKeyPressEvent(Widget w, Ihandle *ih, XKeyEvent *evt, Boolean
/* Shift+Arrows select block */
if (evt->state & ShiftMask)
{
- Widget wItemFocus = motTreeGetFocusNode(ih);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
if (!wItemFocus)
return;
motTreeSelectRange(ih, wItemFocus, wItem, 1);
@@ -2346,16 +2174,9 @@ static void motTreeKeyPressEvent(Widget w, Ihandle *ih, XKeyEvent *evt, Boolean
}
else if(motcode == XK_space && (evt->state & ControlMask))
{
- Widget wItemFocus = motTreeGetFocusNode(ih);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
if (wItemFocus)
- {
- unsigned char isSelected;
- XtVaGetValues(wItemFocus, XmNvisualEmphasis, &isSelected, NULL);
- if (isSelected == XmSELECTED)
- XtVaSetValues(wItemFocus, XmNvisualEmphasis, XmNOT_SELECTED, NULL);
- else
- XtVaSetValues(wItemFocus, XmNvisualEmphasis, XmSELECTED, NULL);
- }
+ motTreeSelectNode(wItemFocus, -1);
}
}
@@ -2378,7 +2199,7 @@ static void motTreeButtonEvent(Widget w, Ihandle* ih, XButtonEvent* evt, Boolean
if (evt->button==Button1)
{
- Widget wItemFocus = motTreeGetFocusNode(ih);
+ Widget wItemFocus = iupdrvTreeGetFocusNode(ih);
static Widget wLastItem = NULL;
static Time last = 0;
int clicktwice = 0, doubleclicktime = XtGetMultiClickTime(iupmot_display);
@@ -2395,6 +2216,11 @@ static void motTreeButtonEvent(Widget w, Ihandle* ih, XButtonEvent* evt, Boolean
*cont = False;
}
wLastItem = wItemFocus;
+
+ if (ih->data->mark_mode==ITREE_MARK_MULTIPLE &&
+ !(evt->state & ShiftMask) &&
+ !(evt->state & ControlMask))
+ motTreeCallMultiUnSelectionCb(ih);
}
else if (evt->button==Button3)
motTreeCallRightClickCb(ih, evt->x, evt->y);
@@ -2436,21 +2262,18 @@ static void motTreeTransferProc(Widget drop_context, XtPointer client_data, Atom
if (motTreeCallDragDropCb(ih, wItemDrag, wItemDrop, &is_ctrl) == IUP_CONTINUE)
{
- /* Copy the dragged item to the new position. */
- Widget wNewItem = motTreeCopyNode(ih, wItemDrag, wItemDrop, is_ctrl);
+ /* Copy or move the dragged item to the new position. */
+ Widget wItemNew = motTreeCopyMoveNode(ih, wItemDrag, wItemDrop, is_ctrl);
- if (!is_ctrl)
+ /* Set focus and selection */
+ if (wItemNew)
{
- /* do not delete the user data, we copy the references in CopyNode */
- motTreeRemoveNode(ih, wItemDrag, 0);
- }
-
- /* Select the dragged item */
- XtVaSetValues(ih->handle, XmNselectedObjects, NULL, NULL);
- XtVaSetValues(ih->handle, XmNselectedObjectCount, 0, NULL);
- XtVaSetValues(wNewItem, XmNvisualEmphasis, XmSELECTED, NULL);
+ XtVaSetValues(ih->handle, XmNselectedObjects, NULL, NULL);
+ XtVaSetValues(ih->handle, XmNselectedObjectCount, 0, NULL);
+ XtVaSetValues(wItemNew, XmNvisualEmphasis, XmSELECTED, NULL);
- motTreeSetFocusNode(ih, wNewItem);
+ motTreeSetFocusNode(ih, wItemNew);
+ }
}
}
@@ -2475,8 +2298,8 @@ static void motTreeDropProc(Widget w, XtPointer client_data, XmDropProcCallbackS
drop_context = drop_data->dragContext;
/* retrieve the data targets */
- iupmotSetArg(args, num_args, XmNexportTargets, &exportTargets);
- iupmotSetArg(args, num_args, XmNnumExportTargets, &numExportTargets);
+ iupMOT_SETARG(args, num_args, XmNexportTargets, &exportTargets);
+ iupMOT_SETARG(args, num_args, XmNnumExportTargets, &numExportTargets);
XtGetValues(drop_context, args, num_args);
for (i = 0; i < (int)numExportTargets; i++)
@@ -2495,17 +2318,17 @@ static void motTreeDropProc(Widget w, XtPointer client_data, XmDropProcCallbackS
num_args = 0;
if ((!found) || (drop_data->dropAction != XmDROP) || (drop_data->operation != XmDROP_COPY && drop_data->operation != XmDROP_MOVE))
{
- iupmotSetArg(args, num_args, XmNtransferStatus, XmTRANSFER_FAILURE);
- iupmotSetArg(args, num_args, XmNnumDropTransfers, 0);
+ iupMOT_SETARG(args, num_args, XmNtransferStatus, XmTRANSFER_FAILURE);
+ iupMOT_SETARG(args, num_args, XmNnumDropTransfers, 0);
}
else
{
/* set up transfer requests for drop site */
transferList[0].target = atomTreeItem;
transferList[0].client_data = (XtPointer)wItemDrop;
- iupmotSetArg(args, num_args, XmNdropTransfers, transferList);
- iupmotSetArg(args, num_args, XmNnumDropTransfers, 1);
- iupmotSetArg(args, num_args, XmNtransferProc, motTreeTransferProc);
+ iupMOT_SETARG(args, num_args, XmNdropTransfers, transferList);
+ iupMOT_SETARG(args, num_args, XmNnumDropTransfers, 1);
+ iupMOT_SETARG(args, num_args, XmNtransferProc, motTreeTransferProc);
}
XmDropTransferStart(drop_context, args, num_args);
@@ -2584,23 +2407,23 @@ static void motTreeStartDrag(Widget w, XButtonEvent* evt, String* params, Cardin
XmNforeground, &fg,
NULL);
- iupmotSetArg(args, num_args, XmNpixmap, pixmap);
- iupmotSetArg(args, num_args, XmNmask, mask);
+ iupMOT_SETARG(args, num_args, XmNpixmap, pixmap);
+ iupMOT_SETARG(args, num_args, XmNmask, mask);
drag_icon = XmCreateDragIcon(w, "drag_icon", args, num_args);
exportList[0] = atomTreeItem;
/* specify resources for DragContext for the transfer */
num_args = 0;
- iupmotSetArg(args, num_args, XmNcursorBackground, bg);
- iupmotSetArg(args, num_args, XmNcursorForeground, fg);
- /* iupmotSetArg(args, num_args, XmNsourcePixmapIcon, drag_icon); works, but only outside the dialog, inside disapears */
- iupmotSetArg(args, num_args, XmNsourceCursorIcon, drag_icon); /* does not work, shows the default cursor */
- iupmotSetArg(args, num_args, XmNexportTargets, exportList);
- iupmotSetArg(args, num_args, XmNnumExportTargets, 1);
- iupmotSetArg(args, num_args, XmNdragOperations, XmDROP_MOVE|XmDROP_COPY);
- iupmotSetArg(args, num_args, XmNconvertProc, motTreeConvertProc);
- iupmotSetArg(args, num_args, XmNclientData, wItemDrag);
+ iupMOT_SETARG(args, num_args, XmNcursorBackground, bg);
+ iupMOT_SETARG(args, num_args, XmNcursorForeground, fg);
+ /* iupMOT_SETARG(args, num_args, XmNsourcePixmapIcon, drag_icon); works, but only outside the dialog, inside disapears */
+ iupMOT_SETARG(args, num_args, XmNsourceCursorIcon, drag_icon); /* does not work, shows the default cursor */
+ iupMOT_SETARG(args, num_args, XmNexportTargets, exportList);
+ iupMOT_SETARG(args, num_args, XmNnumExportTargets, 1);
+ iupMOT_SETARG(args, num_args, XmNdragOperations, XmDROP_MOVE|XmDROP_COPY);
+ iupMOT_SETARG(args, num_args, XmNconvertProc, motTreeConvertProc);
+ iupMOT_SETARG(args, num_args, XmNclientData, wItemDrag);
/* start the drag and register a callback to clean up when done */
drop_context = XmDragStart(w, (XEvent*)evt, args, num_args);
@@ -2628,10 +2451,10 @@ static void motTreeEnableDragDrop(Widget w)
XtOverrideTranslations(w, XtParseTranslationTable(dragTranslations));
importList[0] = atomTreeItem;
- iupmotSetArg(args, num_args, XmNimportTargets, importList);
- iupmotSetArg(args, num_args, XmNnumImportTargets, 1);
- iupmotSetArg(args, num_args, XmNdropSiteOperations, XmDROP_MOVE|XmDROP_COPY);
- iupmotSetArg(args, num_args, XmNdropProc, motTreeDropProc);
+ iupMOT_SETARG(args, num_args, XmNimportTargets, importList);
+ iupMOT_SETARG(args, num_args, XmNnumImportTargets, 1);
+ iupMOT_SETARG(args, num_args, XmNdropSiteOperations, XmDROP_MOVE|XmDROP_COPY);
+ iupMOT_SETARG(args, num_args, XmNdropProc, motTreeDropProc);
XmDropSiteUpdate(w, args, num_args);
XtVaSetValues(XmGetXmDisplay(iupmot_display), XmNenableDragIcon, True, NULL);
@@ -2648,13 +2471,13 @@ static int motTreeMapMethod(Ihandle* ih)
/******************************/
/* Create the scrolled window */
/******************************/
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNscrollingPolicy, XmAUTOMATIC);
- iupmotSetArg(args, num_args, XmNvisualPolicy, XmVARIABLE);
- iupmotSetArg(args, num_args, XmNscrollBarDisplayPolicy, XmAS_NEEDED);
- iupmotSetArg(args, num_args, XmNspacing, 0); /* no space between scrollbars and text */
- iupmotSetArg(args, num_args, XmNborderWidth, 0);
- iupmotSetArg(args, num_args, XmNshadowThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNscrollingPolicy, XmAUTOMATIC);
+ iupMOT_SETARG(args, num_args, XmNvisualPolicy, XmVARIABLE);
+ iupMOT_SETARG(args, num_args, XmNscrollBarDisplayPolicy, XmAS_NEEDED);
+ iupMOT_SETARG(args, num_args, XmNspacing, 0); /* no space between scrollbars and text */
+ iupMOT_SETARG(args, num_args, XmNborderWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 2);
sb_win = XtCreateManagedWidget(
child_id, /* child identifier */
@@ -2672,37 +2495,37 @@ static int motTreeMapMethod(Ihandle* ih)
num_args = 0;
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
- iupmotSetArg(args, num_args, XmNmarginHeight, 0); /* default padding */
- iupmotSetArg(args, num_args, XmNmarginWidth, 0);
+ iupMOT_SETARG(args, num_args, XmNmarginHeight, 0); /* default padding */
+ iupMOT_SETARG(args, num_args, XmNmarginWidth, 0);
if (iupAttribGetBoolean(ih, "CANFOCUS"))
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 2);
- iupmotSetArg(args, num_args, XmNshadowThickness, 0);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNshadowThickness, 0);
- iupmotSetArg(args, num_args, XmNlayoutType, XmOUTLINE);
- iupmotSetArg(args, num_args, XmNentryViewType, XmSMALL_ICON);
- iupmotSetArg(args, num_args, XmNselectionPolicy, XmSINGLE_SELECT);
- iupmotSetArg(args, num_args, XmNoutlineIndentation, 20);
+ iupMOT_SETARG(args, num_args, XmNlayoutType, XmOUTLINE);
+ iupMOT_SETARG(args, num_args, XmNentryViewType, XmSMALL_ICON);
+ iupMOT_SETARG(args, num_args, XmNselectionPolicy, XmSINGLE_SELECT);
+ iupMOT_SETARG(args, num_args, XmNoutlineIndentation, 20);
if (iupAttribGetBoolean(ih, "HIDELINES"))
- iupmotSetArg(args, num_args, XmNoutlineLineStyle, XmNO_LINE);
+ iupMOT_SETARG(args, num_args, XmNoutlineLineStyle, XmNO_LINE);
else
- iupmotSetArg(args, num_args, XmNoutlineLineStyle, XmSINGLE);
+ iupMOT_SETARG(args, num_args, XmNoutlineLineStyle, XmSINGLE);
if (iupAttribGetBoolean(ih, "HIDEBUTTONS"))
- iupmotSetArg(args, num_args, XmNoutlineButtonPolicy, XmOUTLINE_BUTTON_ABSENT);
+ iupMOT_SETARG(args, num_args, XmNoutlineButtonPolicy, XmOUTLINE_BUTTON_ABSENT);
else
- iupmotSetArg(args, num_args, XmNoutlineButtonPolicy, XmOUTLINE_BUTTON_PRESENT);
+ iupMOT_SETARG(args, num_args, XmNoutlineButtonPolicy, XmOUTLINE_BUTTON_PRESENT);
ih->handle = XtCreateManagedWidget(
child_id, /* child identifier */
@@ -2788,17 +2611,30 @@ static int motTreeMapMethod(Ihandle* ih)
if (!ih->data->def_image_expanded_mask) ih->data->def_image_expanded_mask = (void*)XmUNSPECIFIED_PIXMAP;
}
- motTreeAddRootNode(ih);
+ if (iupAttribGetInt(ih, "ADDROOT"))
+ iupdrvTreeAddNode(ih, "-1", ITREE_BRANCH, "", 0);
IupSetCallback(ih, "_IUP_XY2POS_CB", (Icallback)motTreeConvertXYToPos);
+ iupdrvTreeUpdateMarkMode(ih);
+
return IUP_NOERROR;
}
+static void motTreeUnMapMethod(Ihandle* ih)
+{
+ motTreeRemoveAllNodes(ih, 0);
+
+ ih->data->node_count = 0;
+
+ iupdrvBaseUnMapMethod(ih);
+}
+
void iupdrvTreeInitClass(Iclass* ic)
{
/* Driver Dependent Class functions */
ic->Map = motTreeMapMethod;
+ ic->UnMap = motTreeUnMapMethod;
/* Visual */
iupClassRegisterAttribute(ic, "BGCOLOR", NULL, motTreeSetBgColorAttrib, "TXTBGCOLOR", NULL, IUPAF_DEFAULT);
@@ -2807,7 +2643,6 @@ void iupdrvTreeInitClass(Iclass* ic)
/* IupTree Attributes - GENERAL */
iupClassRegisterAttribute(ic, "EXPANDALL", NULL, motTreeSetExpandAllAttrib, NULL, NULL, IUPAF_WRITEONLY||IUPAF_NO_INHERIT);
iupClassRegisterAttribute(ic, "INDENTATION", motTreeGetIndentationAttrib, motTreeSetIndentationAttrib, NULL, NULL, IUPAF_DEFAULT);
- iupClassRegisterAttribute(ic, "COUNT", motTreeGetCountAttrib, NULL, NULL, NULL, IUPAF_NO_DEFAULTVALUE|IUPAF_READONLY|IUPAF_NO_INHERIT);
iupClassRegisterAttribute(ic, "SPACING", iupTreeGetSpacingAttrib, motTreeSetSpacingAttrib, NULL, NULL, IUPAF_NOT_MAPPED);
iupClassRegisterAttribute(ic, "TOPITEM", NULL, motTreeSetTopItemAttrib, NULL, NULL, IUPAF_WRITEONLY|IUPAF_NO_INHERIT);
@@ -2827,7 +2662,6 @@ void iupdrvTreeInitClass(Iclass* ic)
iupClassRegisterAttributeId(ic, "COLOR", motTreeGetColorAttrib, motTreeSetColorAttrib, IUPAF_NO_INHERIT);
iupClassRegisterAttributeId(ic, "NAME", motTreeGetTitleAttrib, motTreeSetTitleAttrib, IUPAF_NO_INHERIT);
iupClassRegisterAttributeId(ic, "TITLE", motTreeGetTitleAttrib, motTreeSetTitleAttrib, IUPAF_NO_INHERIT);
- iupClassRegisterAttributeId(ic, "USERDATA", motTreeGetUserDataAttrib, motTreeSetUserDataAttrib, IUPAF_NO_STRING|IUPAF_NO_INHERIT);
iupClassRegisterAttributeId(ic, "CHILDCOUNT", motTreeGetChildCountAttrib, NULL, IUPAF_READONLY|IUPAF_NO_INHERIT);
iupClassRegisterAttributeId(ic, "TITLEFONT", motTreeGetTitleFontAttrib, motTreeSetTitleFontAttrib, IUPAF_NO_INHERIT);
@@ -2836,6 +2670,7 @@ void iupdrvTreeInitClass(Iclass* ic)
iupClassRegisterAttribute (ic, "MARK", NULL, motTreeSetMarkAttrib, NULL, NULL, IUPAF_WRITEONLY|IUPAF_NO_INHERIT);
iupClassRegisterAttribute (ic, "STARTING", NULL, motTreeSetMarkStartAttrib, NULL, NULL, IUPAF_NO_DEFAULTVALUE|IUPAF_NO_INHERIT);
iupClassRegisterAttribute (ic, "MARKSTART", NULL, motTreeSetMarkStartAttrib, NULL, NULL, IUPAF_NO_DEFAULTVALUE|IUPAF_NO_INHERIT);
+ iupClassRegisterAttribute (ic, "MARKEDNODES", motTreeGetMarkedNodesAttrib, motTreeSetMarkedNodesAttrib, NULL, NULL, IUPAF_NO_DEFAULTVALUE|IUPAF_NO_INHERIT);
iupClassRegisterAttribute (ic, "VALUE", motTreeGetValueAttrib, motTreeSetValueAttrib, NULL, NULL, IUPAF_NO_DEFAULTVALUE|IUPAF_NO_INHERIT);
@@ -2844,5 +2679,4 @@ void iupdrvTreeInitClass(Iclass* ic)
iupClassRegisterAttribute(ic, "RENAME", NULL, motTreeSetRenameAttrib, NULL, NULL, IUPAF_WRITEONLY|IUPAF_NO_INHERIT);
iupClassRegisterAttributeId(ic, "MOVENODE", NULL, motTreeSetMoveNodeAttrib, IUPAF_NOT_MAPPED|IUPAF_WRITEONLY|IUPAF_NO_INHERIT);
iupClassRegisterAttributeId(ic, "COPYNODE", NULL, motTreeSetCopyNodeAttrib, IUPAF_NOT_MAPPED|IUPAF_WRITEONLY|IUPAF_NO_INHERIT);
- iupClassRegisterAttributeId(ic, "FINDUSERDATA", motTreeGetFindUserDataAttrib, NULL, IUPAF_READONLY|IUPAF_NO_INHERIT);
}
diff --git a/iup/src/mot/iupmot_val.c b/iup/src/mot/iupmot_val.c
index 200d2b4..ce9eba7 100755
--- a/iup/src/mot/iupmot_val.c
+++ b/iup/src/mot/iupmot_val.c
@@ -383,41 +383,41 @@ static int motValMapMethod(Ihandle* ih)
int show_ticks;
/* Core */
- iupmotSetArg(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
- iupmotSetArg(args, num_args, XmNx, 0); /* x-position */
- iupmotSetArg(args, num_args, XmNy, 0); /* y-position */
- iupmotSetArg(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
- iupmotSetArg(args, num_args, XmNheight, 10); /* default height to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNmappedWhenManaged, False); /* not visible when managed */
+ iupMOT_SETARG(args, num_args, XmNx, 0); /* x-position */
+ iupMOT_SETARG(args, num_args, XmNy, 0); /* y-position */
+ iupMOT_SETARG(args, num_args, XmNwidth, 10); /* default width to avoid 0 */
+ iupMOT_SETARG(args, num_args, XmNheight, 10); /* default height to avoid 0 */
/* Primitive */
if (iupAttribGetBoolean(ih, "CANFOCUS"))
- iupmotSetArg(args, num_args, XmNtraversalOn, True);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, True);
else
- iupmotSetArg(args, num_args, XmNtraversalOn, False);
- iupmotSetArg(args, num_args, XmNhighlightThickness, 2);
- iupmotSetArg(args, num_args, XmNnavigationType, XmTAB_GROUP);
+ iupMOT_SETARG(args, num_args, XmNtraversalOn, False);
+ iupMOT_SETARG(args, num_args, XmNhighlightThickness, 2);
+ iupMOT_SETARG(args, num_args, XmNnavigationType, XmTAB_GROUP);
/* Scale */
- iupmotSetArg(args, num_args, XmNminimum, 0);
- iupmotSetArg(args, num_args, XmNmaximum, SHRT_MAX);
- iupmotSetArg(args, num_args, XmNslidingMode, XmSLIDER);
- iupmotSetArg(args, num_args, XmNsliderMark, XmETCHED_LINE);
- iupmotSetArg(args, num_args, XmNsliderSize, 16);
- iupmotSetArg(args, num_args, XmNshowValue, XmNONE);
+ iupMOT_SETARG(args, num_args, XmNminimum, 0);
+ iupMOT_SETARG(args, num_args, XmNmaximum, SHRT_MAX);
+ iupMOT_SETARG(args, num_args, XmNslidingMode, XmSLIDER);
+ iupMOT_SETARG(args, num_args, XmNsliderMark, XmETCHED_LINE);
+ iupMOT_SETARG(args, num_args, XmNsliderSize, 16);
+ iupMOT_SETARG(args, num_args, XmNshowValue, XmNONE);
if (ih->data->type == IVAL_HORIZONTAL)
{
- iupmotSetArg(args, num_args, XmNorientation, XmHORIZONTAL);
+ iupMOT_SETARG(args, num_args, XmNorientation, XmHORIZONTAL);
if (ih->data->inverted)
- iupmotSetArg(args, num_args, XmNprocessingDirection, XmMAX_ON_LEFT);
+ iupMOT_SETARG(args, num_args, XmNprocessingDirection, XmMAX_ON_LEFT);
else
- iupmotSetArg(args, num_args, XmNprocessingDirection, XmMAX_ON_RIGHT);
+ iupMOT_SETARG(args, num_args, XmNprocessingDirection, XmMAX_ON_RIGHT);
}
else
{
- iupmotSetArg(args, num_args, XmNorientation, XmVERTICAL);
+ iupMOT_SETARG(args, num_args, XmNorientation, XmVERTICAL);
if (ih->data->inverted)
- iupmotSetArg(args, num_args, XmNprocessingDirection, XmMAX_ON_TOP);
+ iupMOT_SETARG(args, num_args, XmNprocessingDirection, XmMAX_ON_TOP);
else
- iupmotSetArg(args, num_args, XmNprocessingDirection, XmMAX_ON_BOTTOM);
+ iupMOT_SETARG(args, num_args, XmNprocessingDirection, XmMAX_ON_BOTTOM);
}
ih->handle = XtCreateManagedWidget(
diff --git a/iup/src/mot/iupunix_info.c b/iup/src/mot/iupunix_info.c
index b522638..f09573c 100755
--- a/iup/src/mot/iupunix_info.c
+++ b/iup/src/mot/iupunix_info.c
@@ -282,7 +282,7 @@ char *iupdrvGetSystemName(void)
char *iupdrvGetSystemVersion(void)
{
struct utsname un;
- char *str = iupStrGetMemory(60);
+ char *str = iupStrGetMemory(100);
uname(&un);
strcpy(str, un.release);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 23:06:44 +0000