conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Remove tabs from source code. Another excuse to test the buildbot. 

git-svn-id: svn://svn.zoy.org/elk/trunk@273 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2006-09-18 16:59:55 +00:00
parent 8fe6661370
commit dcdb7f3f16
11 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/xwidgets/motif/list.d
View File

@ -41,9 +41,9 @@
tail = ret = P_Make_List (Make_Integer (len), Null); tail = ret = P_Make_List (Make_Integer (len), Null);
GC_Link2 (ret, tail); GC_Link2 (ret, tail);
for ( ; len > 0; len--, tail = Cdr (tail)) { for ( ; len > 0; len--, tail = Cdr (tail)) {
if (!XmStringGetLtoR (*tab++, XmSTRING_DEFAULT_CHARSET, &text)) if (!XmStringGetLtoR (*tab++, XmSTRING_DEFAULT_CHARSET, &text))
text = \"\"; text = \"\";
Car (tail) = Make_String (text, strlen (text)); Car (tail) = Make_String (text, strlen (text));
} }
GC_Unlink; GC_Unlink;
return ret; return ret;
@ -66,18 +66,18 @@
GC_Node2; GC_Node2;
if (!XmStringGetLtoR (p->item, XmSTRING_DEFAULT_CHARSET, &text)) if (!XmStringGetLtoR (p->item, XmSTRING_DEFAULT_CHARSET, &text))
text = \"\"; text = \"\";
ret = s = Make_String (text, strlen (text)); ret = s = Make_String (text, strlen (text));
GC_Link2 (ret, s); GC_Link2 (ret, s);
ret = Cons (ret, Null); ret = Cons (ret, Null);
if (p->reason == XmCR_MULTIPLE_SELECT if (p->reason == XmCR_MULTIPLE_SELECT
|| p->reason == XmCR_EXTENDED_SELECT) { || p->reason == XmCR_EXTENDED_SELECT) {
s = String_Table_To_Scheme (p->selected_items, p->selected_item_count); s = String_Table_To_Scheme (p->selected_items, p->selected_item_count);
ret = Cons (s, ret); ret = Cons (s, ret);
s = Bits_To_Symbols ((unsigned long)p->selection_type, 0, Type_Syms); s = Bits_To_Symbols ((unsigned long)p->selection_type, 0, Type_Syms);
ret = Cons (s, ret); ret = Cons (s, ret);
} else { } else {
ret = Cons (Make_Integer (p->item_position), ret); ret = Cons (Make_Integer (p->item_position), ret);
} }
s = Get_Any_CB ((XmAnyCallbackStruct *)p); s = Get_Any_CB ((XmAnyCallbackStruct *)p);
ret = Cons (Cdr (s), ret); ret = Cons (Cdr (s), ret);

8
lib/xwidgets/motif/row-column.d
View File

@ -54,7 +54,7 @@
XtSetArg (a, XmNwhichButton, &b); XtSetArg (a, XmNwhichButton, &b);
XtGetValues (popup, &a, 1); XtGetValues (popup, &a, 1);
if (ep->button != b) if (ep->button != b)
return; return;
XmMenuPosition (popup, ep); XmMenuPosition (popup, ep);
XtManageChild (popup); XtManageChild (popup);
}") }")
@ -83,11 +83,11 @@
XtSetArg (a, XmNuserData, &client_data); XtSetArg (a, XmNuserData, &client_data);
XtGetValues (WIDGET(w)->widget, &a, 1); XtGetValues (WIDGET(w)->widget, &a, 1);
if (client_data) if (client_data)
XtRemoveEventHandler (WIDGET(w)->widget, ButtonPressMask, 0, XtRemoveEventHandler (WIDGET(w)->widget, ButtonPressMask, 0,
Post_Handler, client_data); Post_Handler, client_data);
client_data = (XtPointer)WIDGET(m)->widget; client_data = (XtPointer)WIDGET(m)->widget;
XtAddEventHandler (WIDGET(w)->widget, ButtonPressMask, 0, XtAddEventHandler (WIDGET(w)->widget, ButtonPressMask, 0,
Post_Handler, client_data); Post_Handler, client_data);
client_data = (XtPointer)WIDGET(m)->widget; client_data = (XtPointer)WIDGET(m)->widget;
XtSetValues (WIDGET(w)->widget, &a, 1); XtSetValues (WIDGET(w)->widget, &a, 1);
return Void;") return Void;")

6
lib/xwidgets/motif/scroll-bar.d
View File

@ -62,11 +62,11 @@
(c->scheme 'callback:scroll-bar-decrementCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-decrementCallback scrollbar-callback->scheme)
(c->scheme 'callback:scroll-bar-incrementCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-incrementCallback scrollbar-callback->scheme)
(c->scheme 'callback:scroll-bar-pageDecrementCallback (c->scheme 'callback:scroll-bar-pageDecrementCallback
scrollbar-callback->scheme) scrollbar-callback->scheme)
(c->scheme 'callback:scroll-bar-pageIncrementCallback (c->scheme 'callback:scroll-bar-pageIncrementCallback
scrollbar-callback->scheme) scrollbar-callback->scheme)
(c->scheme 'callback:scroll-bar-dragCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-dragCallback scrollbar-callback->scheme)
(c->scheme 'callback:scroll-bar-toTopCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-toTopCallback scrollbar-callback->scheme)
(c->scheme 'callback:scroll-bar-toBottomCallback scrollbar-callback->scheme) (c->scheme 'callback:scroll-bar-toBottomCallback scrollbar-callback->scheme)
(c->scheme 'callback:scroll-bar-valueChangedCallback (c->scheme 'callback:scroll-bar-valueChangedCallback
scrollbar-callback->scheme) scrollbar-callback->scheme)

12
lib/xwidgets/motif/support.d
View File

@ -89,7 +89,7 @@
Destroy_Event_Args (args); Destroy_Event_Args (args);
} }
ret = Cons (Bits_To_Symbols ((unsigned long)p->reason, 0, Reason_Syms), ret = Cons (Bits_To_Symbols ((unsigned long)p->reason, 0, Reason_Syms),
ret); ret);
GC_Unlink; GC_Unlink;
return ret; return ret;
}") }")
@ -103,7 +103,7 @@
GC_Node2; GC_Node2;
if (!XmStringGetLtoR (p->value, XmSTRING_DEFAULT_CHARSET, &text)) if (!XmStringGetLtoR (p->value, XmSTRING_DEFAULT_CHARSET, &text))
text = \"\"; text = \"\";
ret = s = Make_String (text, strlen (text)); ret = s = Make_String (text, strlen (text));
GC_Link2 (ret, s); GC_Link2 (ret, s);
ret = Cons (ret, Null); ret = Cons (ret, Null);
@ -124,13 +124,13 @@
Alloca_Begin; Alloca_Begin;
tab = (XmString *)XtMalloc (Get_Integer (P_Length (x)) tab = (XmString *)XtMalloc (Get_Integer (P_Length (x))
* sizeof (XmString)); * sizeof (XmString));
/* tab is never freed since the converter must return a new address /* tab is never freed since the converter must return a new address
* each time it is called. * each time it is called.
*/ */
for (t = x; TYPE(t) == T_Pair; t = Cdr (t)) { for (t = x; TYPE(t) == T_Pair; t = Cdr (t)) {
Get_Strsym_Stack (Car (t), s); Get_Strsym_Stack (Car (t), s);
tab[i++] = XmStringCreate (s, XmSTRING_DEFAULT_CHARSET); tab[i++] = XmStringCreate (s, XmSTRING_DEFAULT_CHARSET);
} }
Alloca_End; Alloca_End;
return (XtArgVal)tab; return (XtArgVal)tab;
@ -195,7 +195,7 @@
(define xm-string->scheme (define xm-string->scheme
" char *text; " char *text;
if (!XmStringGetLtoR ((XmString)x, XmSTRING_DEFAULT_CHARSET, &text)) if (!XmStringGetLtoR ((XmString)x, XmSTRING_DEFAULT_CHARSET, &text))
text = \"\"; text = \"\";
return Make_String (text, strlen (text));") return Make_String (text, strlen (text));")
(define scheme->xm-string (define scheme->xm-string

2
lib/xwidgets/motif/toggle-btn.d
View File

@ -49,4 +49,4 @@
(c->scheme 'callback:toggle-button-valueChangedCallback (c->scheme 'callback:toggle-button-valueChangedCallback
toggle-button-callback->scheme) toggle-button-callback->scheme)
(c->scheme 'callback:toggle-button-gadget-valueChangedCallback (c->scheme 'callback:toggle-button-gadget-valueChangedCallback
toggle-button-callback->scheme) toggle-button-callback->scheme)

8
lib/xwidgets/xaw/grip.d
View File

@ -46,10 +46,10 @@
Destroy_Event_Args (args); Destroy_Event_Args (args);
t = P_Make_List (Make_Integer (p->num_params), Null); t = P_Make_List (Make_Integer (p->num_params), Null);
for (i = 0, Cdr (ret) = t; i < p->num_params; i++, t = Cdr (t)) { for (i = 0, Cdr (ret) = t; i < p->num_params; i++, t = Cdr (t)) {
Object s; Object s;
s = Make_String (p->params[i], strlen (p->params[i])); s = Make_String (p->params[i], strlen (p->params[i]));
Car (t) = s; Car (t) = s;
} }
GC_Unlink; GC_Unlink;
return ret;") return ret;")

10
lib/xwidgets/xaw/list.d
View File

@ -40,8 +40,8 @@ static char **Get_List (Object x) {
n = Fast_Length (x); n = Fast_Length (x);
l = (char **)XtMalloc ((n+1) * sizeof (char *)); l = (char **)XtMalloc ((n+1) * sizeof (char *));
for (i = 0; i < n; i++, x = Cdr (x)) { for (i = 0; i < n; i++, x = Cdr (x)) {
Get_Strsym_Stack (Car (x), s); Get_Strsym_Stack (Car (x), s);
l[i] = XtNewString (s); l[i] = XtNewString (s);
} }
l[i] = 0; l[i] = 0;
Alloca_End; Alloca_End;
@ -55,7 +55,7 @@ static char **Get_List (Object x) {
(c->scheme 'callback:list-callback (c->scheme 'callback:list-callback
" XawListReturnStruct *p = (XawListReturnStruct *)x; " XawListReturnStruct *p = (XawListReturnStruct *)x;
return Cons (Make_String (p->string, strlen (p->string)), return Cons (Make_String (p->string, strlen (p->string)),
Make_Integer (p->list_index));") Make_Integer (p->list_index));")
(scheme->c 'list-list (scheme->c 'list-list
" return (XtArgVal)Get_List (x);") " return (XtArgVal)Get_List (x);")
@ -82,6 +82,6 @@ static char **Get_List (Object x) {
Check_Widget_Class (w, listWidgetClass); Check_Widget_Class (w, listWidgetClass);
p = XawListShowCurrent (WIDGET(w)->widget); p = XawListShowCurrent (WIDGET(w)->widget);
if (p->list_index == XAW_LIST_NONE) if (p->list_index == XAW_LIST_NONE)
return False; return False;
return Cons (Make_String (p->string, strlen (p->string)), return Cons (Make_String (p->string, strlen (p->string)),
Make_Integer (p->list_index));") Make_Integer (p->list_index));")

2
lib/xwidgets/xaw/paned.d
View File

@ -40,7 +40,7 @@
(define-primitive 'paned-set-min-max! '(w min max) (define-primitive 'paned-set-min-max! '(w min max)
" Check_Widget (w); " Check_Widget (w);
XawPanedSetMinMax (WIDGET(w)->widget, Get_Integer (min), XawPanedSetMinMax (WIDGET(w)->widget, Get_Integer (min),
Get_Integer (max)); Get_Integer (max));
return Void;") return Void;")
(define-primitive 'paned-get-min-max '(w) (define-primitive 'paned-get-min-max '(w)

2
lib/xwidgets/xaw/porthole.d
View File

@ -59,6 +59,6 @@
ret = Cons (Make_Integer (p->slider_y), ret); ret = Cons (Make_Integer (p->slider_y), ret);
ret = Cons (Make_Integer (p->slider_x), ret); ret = Cons (Make_Integer (p->slider_x), ret);
ret = Cons (Bits_To_Symbols ((unsigned long)p->changed, 1, Panner_Syms), ret = Cons (Bits_To_Symbols ((unsigned long)p->changed, 1, Panner_Syms),
ret); ret);
GC_Unlink; GC_Unlink;
return ret;") return ret;")

2
lib/xwidgets/xaw/simplemenu.d
View File

@ -39,7 +39,7 @@
(define-primitive 'simplemenu-get-active-entry '(w) (define-primitive 'simplemenu-get-active-entry '(w)
" Check_Widget_Class (w, simpleMenuWidgetClass); " Check_Widget_Class (w, simpleMenuWidgetClass);
return return
Make_Widget_Foreign (XawSimpleMenuGetActiveEntry (WIDGET(w)->widget));") Make_Widget_Foreign (XawSimpleMenuGetActiveEntry (WIDGET(w)->widget));")
(define-primitive 'simplemenu-clear-active-entry '(w) (define-primitive 'simplemenu-clear-active-entry '(w)
" Check_Widget_Class (w, simpleMenuWidgetClass); " Check_Widget_Class (w, simpleMenuWidgetClass);

4
lib/xwidgets/xaw/stripchart.d
View File

@ -55,7 +55,7 @@
XtSetArg (a[0], XtNgetValue, &c); XtSetArg (a[0], XtNgetValue, &c);
XtGetValues (WIDGET(w)->widget, a, 1); XtGetValues (WIDGET(w)->widget, a, 1);
if (c[0].callback) if (c[0].callback)
Primitive_Error (\"stripchart already has a sampler\"); Primitive_Error (\"stripchart already has a sampler\");
i = Register_Function (p); i = Register_Function (p);
XtAddCallback (WIDGET(w)->widget, XtNgetValue, Get_Value, (XtPointer)i); XtAddCallback (WIDGET(w)->widget, XtNgetValue, Get_Value, (XtPointer)i);
return Make_Id ('s', (XtPointer)WIDGET(w)->widget, i);") return Make_Id ('s', (XtPointer)WIDGET(w)->widget, i);")
@ -65,6 +65,6 @@
w = (Widget)Use_Id (i, 's'); w = (Widget)Use_Id (i, 's');
XtRemoveCallback (w, XtNgetValue, Get_Value, XtRemoveCallback (w, XtNgetValue, Get_Value,
(XtPointer)IDENTIFIER(i)->num); (XtPointer)IDENTIFIER(i)->num);
Deregister_Function (IDENTIFIER(i)->num); Deregister_Function (IDENTIFIER(i)->num);
return Void;") return Void;")