gmane.comp.lib.agar.scm

Agar: r7796 - trunk/gui

Agar-SVN — 2008-10-07T09:57:32

Author: vedge Date: 2008-10-07 06:57:01 -0300 (Tue, 07 Oct 2008) New Revision: 7796 Modified: trunk/gui/AG_Checkbox.3 trunk/gui/checkbox.c trunk/gui/checkbox.h Log: pack a Label widget instead of using the Text API. Modified: trunk/gui/AG_Checkbox.3 =================================================================== --- trunk/gui/AG_Checkbox.32008-10-07 05:16:06 UTC (rev 7795) +++ trunk/gui/AG_Checkbox.32008-10-07 09:57:01 UTC (rev 7796) < at >< at > -48,7 +48,7 < at >< at > .Sh INITIALIZATION .nr nS 1 .Ft "AG_Checkbox *" -.Fn AG_CheckboxNew "AG_Widget *parent" "Uint flags" "const char *label" +.Fn AG_CheckboxNew "AG_Widget *parent" "Uint flags" "const char *label" "..." .Pp .Ft "AG_Checkbox *" .Fn AG_CheckboxNewFn "AG_Widget *parent" "Uint flags" "const char *label" "AG_EventFn fn" "const char *fmt" "..." < at >< at > -79,10 +79,13 < at >< at > .Fn AG_CheckboxNew function allocates, initializes, and attaches a .Nm -widget displaying the given text label. +widget. +If the +.Fa label +argument is given, it sets a default text label. The .Fn AG_CheckboxNewFn -constructor also assigns the specified callback function to the +variant also assigns the specified callback function to the .Sq checkbox-changed event. .Pp Modified: trunk/gui/checkbox.c =================================================================== --- trunk/gui/checkbox.c2008-10-07 05:16:06 UTC (rev 7795) +++ trunk/gui/checkbox.c2008-10-07 09:57:01 UTC (rev 7796) < at >< at > -34,20 +34,25 < at >< at > #include #include -static void mousebuttondown(AG_Event *); -static void keydown(AG_Event *); - AG_Checkbox * -AG_CheckboxNew(void *parent, Uint flags, const char *label) +AG_CheckboxNew(void *parent, Uint flags, const char *fmt, ...) { AG_Checkbox *cb; +va_list args; cb = Malloc(sizeof(AG_Checkbox)); AG_ObjectInit(cb, &agCheckboxClass); cb->flags |= flags; -if (label != NULL) { -cb->labelTxt = Strdup(label); + +if (fmt != NULL) { +char text[AG_LABEL_MAX]; + +va_start(args, fmt); +Vsnprintf(text, sizeof(text), fmt, args); +va_end(args); +cb->lbl = AG_LabelNewString(cb, 0, text); } + if (flags & AG_CHECKBOX_SET) { cb->state = 1; } < at >< at > -144,33 +149,58 < at >< at > } static void +MouseButtonDown(AG_Event *event) +{ +AG_Checkbox *cb = AG_SELF(); +int button = AG_INT(1); + +if (!AG_WidgetEnabled(cb)) +return; + +if (button == SDL_BUTTON(1)) { +AG_CheckboxToggle(cb); +} +AG_WidgetFocus(cb); +} + +static void +KeyDown(AG_Event *event) +{ +AG_Checkbox *cb = AG_SELF(); + +if (!AG_WidgetEnabled(cb)) +return; + +switch (AG_SDLKEY(1)) { +case SDLK_RETURN: +case SDLK_SPACE: +AG_CheckboxToggle(cb); +break; +default: +break; +} +} + +static void Init(void *obj) { AG_Checkbox *cb = obj; WIDGET(cb)->flags |= AG_WIDGET_FOCUSABLE; -AG_WidgetBind(cb, "state", AG_WIDGET_BOOL, &cb->state); +AG_WidgetBindBool(cb, "state", &cb->state); cb->flags = 0; cb->state = 0; -cb->labelTxt = NULL; -cb->label = -1; +cb->lbl = NULL; cb->spacing = 6; +cb->btnSize = agTextFontHeight; -AG_SetEvent(cb, "window-mousebuttondown", mousebuttondown, NULL); -AG_SetEvent(cb, "window-keydown", keydown, NULL); +AG_SetEvent(cb, "window-mousebuttondown", MouseButtonDown, NULL); +AG_SetEvent(cb, "window-keydown", KeyDown, NULL); } static void -Destroy(void *p) -{ -AG_Checkbox *cb = p; - -Free(cb->labelTxt); -} - -static void Draw(void *obj) { AG_Checkbox *cb = obj; < at >< at > -213,64 +243,27 < at >< at > state = 0; break; } -STYLE(cb)->CheckboxButton(cb, state); -AG_WidgetUnlockBinding(stateb); -if (cb->labelTxt == NULL || cb->labelTxt[0] == '\0') { -return; +STYLE(cb)->CheckboxButton(cb, state); +if (cb->lbl != NULL) { +AG_WidgetDraw(cb->lbl); } -if (cb->label == -1) { -AG_TextColor(CHECKBOX_TXT_COLOR); -cb->label = AG_WidgetMapSurface(cb, - AG_TextRender(cb->labelTxt)); -} -AG_WidgetBlitSurface(cb, cb->label, HEIGHT(cb)+cb->spacing, 0); +AG_WidgetUnlockBinding(stateb); } static void -mousebuttondown(AG_Event *event) -{ -AG_Checkbox *cb = AG_SELF(); -int button = AG_INT(1); - -if (!AG_WidgetEnabled(cb)) -return; - -if (button == SDL_BUTTON(1)) { -AG_CheckboxToggle(cb); -} -AG_WidgetFocus(cb); -} - -static void -keydown(AG_Event *event) -{ -AG_Checkbox *cb = AG_SELF(); - -if (!AG_WidgetEnabled(cb)) -return; - -switch (AG_SDLKEY(1)) { -case SDLK_RETURN: -case SDLK_SPACE: -AG_CheckboxToggle(cb); -break; -default: -break; -} -} - -static void SizeRequest(void *obj, AG_SizeReq *r) { AG_Checkbox *cb = obj; +AG_SizeReq rLbl; -r->h = agTextFontHeight; -r->w = agTextFontHeight; +r->h = cb->btnSize; +r->w = cb->btnSize; -if (cb->labelTxt != NULL) { -AG_TextSize(cb->labelTxt, &r->w, NULL); -r->w += agTextFontHeight + cb->spacing; +if (cb->lbl != NULL) { +AG_WidgetSizeReq(cb->lbl, &rLbl); +r->w += cb->spacing + rLbl.w; +r->h = MAX(r->h, rLbl.h); } } < at >< at > -278,21 +271,17 < at >< at > SizeAllocate(void *obj, const AG_SizeAlloc *a) { AG_Checkbox *cb = obj; +AG_SizeAlloc aLbl; -if (a->w < agTextFontHeight || a->h < agTextFontHeight) { +if (a->w < cb->btnSize || a->h < cb->btnSize) { return (-1); } -if (cb->labelTxt != NULL) { -int wLbl, hLbl; - -AG_TextSize(cb->labelTxt, &wLbl, &hLbl); - -if (a->w < agTextFontHeight+cb->spacing+wLbl || - a->h < agTextFontHeight) { -AG_WidgetEnableClipping(cb, AG_RECT(0,0,a->w,a->h)); -} else { -AG_WidgetDisableClipping(cb); -} +if (cb->lbl != NULL) { +aLbl.x = cb->btnSize + cb->spacing; +aLbl.y = HEIGHT(cb)/2 - HEIGHT(cb->lbl)/2; +aLbl.w = a->w - aLbl.x; +aLbl.h = a->h; +AG_WidgetSizeAlloc(cb->lbl, &aLbl); } return (0); } < at >< at > -389,7 +378,7 < at >< at > { 0,0 }, Init, NULL,/* free */ -Destroy, +NULL,/* destroy */ NULL,/* load */ NULL,/* save */ NULL/* edit */ Modified: trunk/gui/checkbox.h =================================================================== --- trunk/gui/checkbox.h2008-10-07 05:16:06 UTC (rev 7795) +++ trunk/gui/checkbox.h2008-10-07 09:57:01 UTC (rev 7796) < at >< at > -4,6 +4,7 < at >< at > #define _AGAR_WIDGET_CHECKBOX_H_ #include +#include #include "begin_code.h" < at >< at > -14,16 +15,16 < at >< at > #define AG_CHECKBOX_VFILL0x02 #define AG_CHECKBOX_EXPAND(AG_CHECKBOX_HFILL|AG_CHECKBOX_VFILL) #define AG_CHECKBOX_SET0x04 -int state; -char *labelTxt; -int label; -int spacing; +int state;/* Default "state" binding */ +int spacing;/* Spacing in pixels */ +AG_Label *lbl;/* Text label */ +int btnSize;/* Button size in pixels */ } AG_Checkbox; __BEGIN_DECLS extern AG_WidgetClass agCheckboxClass; -AG_Checkbox *AG_CheckboxNew(void *, Uint, const char *); +AG_Checkbox *AG_CheckboxNew(void *, Uint, const char *, ...); AG_Checkbox *AG_CheckboxNewFn(void *, Uint, const char *, AG_EventFn, const char *, ...); AG_Checkbox *AG_CheckboxNewInt(void *, Uint, const char *, int *);

Agar: r7795 - trunk/math

Agar-SVN — 2008-10-07T05:16:35

Author: vedge Date: 2008-10-07 02:16:06 -0300 (Tue, 07 Oct 2008) New Revision: 7795 Modified: trunk/math/m_vector_fpu.h Log: typo __inline -> __inline__ Modified: trunk/math/m_vector_fpu.h =================================================================== --- trunk/math/m_vector_fpu.h2008-10-07 04:57:25 UTC (rev 7794) +++ trunk/math/m_vector_fpu.h2008-10-07 05:16:06 UTC (rev 7795) < at >< at > -60,7 +60,7 < at >< at > v->v[i] = 0.0; } -static __inline void +static __inline__ void M_VectorFree_FPU(void *pv) { M_VectorFPU *v=pv;

Agar: r7794 - trunk/gui

Agar-SVN — 2008-10-07T04:57:54

Author: vedge Date: 2008-10-07 01:57:25 -0300 (Tue, 07 Oct 2008) New Revision: 7794 Modified: trunk/gui/style_default.c Log: fix cosmetic off-by-one in WindowBackground() Modified: trunk/gui/style_default.c =================================================================== --- trunk/gui/style_default.c2008-10-07 04:44:57 UTC (rev 7793) +++ trunk/gui/style_default.c2008-10-07 04:57:25 UTC (rev 7794) < at >< at > -62,7 +62,7 < at >< at > if (!(win->flags & AG_WINDOW_NOBACKGROUND)) { AG_DrawRectFilled(win, - AG_RECT(0, hBar, WIDTH(win), HEIGHT(win)-hBar), + AG_RECT(0, hBar-1, WIDTH(win), HEIGHT(win)-hBar), AG_COLOR(WINDOW_BG_COLOR)); } if (win->wBorderBot > 0) {

Agar: r7793 - in trunk: core gui math

Agar-SVN — 2008-10-07T04:45:26

Author: vedge Date: 2008-10-07 01:44:57 -0300 (Tue, 07 Oct 2008) New Revision: 7793 Modified: trunk/core/error.h trunk/core/event.h trunk/core/prop.h trunk/gui/gui_math.h trunk/math/m_line.h Log: use consistent "static __inline__" form to give gen-declspecs.pl a chance.. Modified: trunk/core/error.h =================================================================== --- trunk/core/error.h2008-10-07 04:43:32 UTC (rev 7792) +++ trunk/core/error.h2008-10-07 04:44:57 UTC (rev 7793) < at >< at > -103,7 +103,11 < at >< at > # define AG_Free(p) free(p) # undef FREE_NULL_IS_A_NOOP #else -static __inline__ void AG_Free(void *p) { if (p != NULL) free(p); } +static __inline__ void +AG_Free(void *p) { +if (p != NULL) +free(p); +} #endif __END_DECLS Modified: trunk/core/event.h =================================================================== --- trunk/core/event.h2008-10-07 04:43:32 UTC (rev 7792) +++ trunk/core/event.h2008-10-07 04:44:57 UTC (rev 7793) < at >< at > -105,35 +105,6 < at >< at > typedef void (*AG_EventFn)(AG_Event *); -__BEGIN_DECLS -extern const char *agEvArgTypeNames[]; - -void AG_EventInit(AG_Event *); -void AG_EventArgs(AG_Event *, const char *, ...); -AG_Event *AG_SetEvent(void *, const char *, AG_EventFn, const char *, ....); -AG_Event *AG_AddEvent(void *, const char *, AG_EventFn, const char *, ....); -void AG_UnsetEvent(void *, const char *); -void AG_PostEvent(void *, void *, const char *, const char *, ...); -int AG_ProcessEvent(SDL_Event *); -AG_Event *AG_FindEventHandler(void *, const char *); - -int AG_SchedEvent(void *, void *, Uint32, const char *, - const char *, ...); -int AG_ReschedEvent(void *, const char *, Uint32); -int AG_CancelEvent(void *, const char *); -void AG_ForwardEvent(void *, void *, AG_Event *); -void AG_BindGlobalKey(SDLKey, SDLMod, void (*)(void)); -void AG_BindGlobalKeyEv(SDLKey, SDLMod, void (*)(AG_Event *)); - -/* Execute an event handler routine without processing any arguments. */ -static __inline__ void -AG_ExecEventFn(void *obj, AG_Event *ev) -{ -if (ev->handler != NULL) -AG_PostEvent(NULL, obj, ev->name, NULL); -} -__END_DECLS - #ifdef DEBUG #define AG_EVENT_DEFAULT_CASE() default: AG_FatalError("Bad event arg spec"); #define AG_EVENT_BOUNDARY_CHECK(ev) \ < at >< at > -210,10 +181,35 < at >< at > } __BEGIN_DECLS -/* - * Push arguments onto an Event structure. - */ +extern const char *agEvArgTypeNames[]; + +void AG_EventInit(AG_Event *); +void AG_EventArgs(AG_Event *, const char *, ...); +AG_Event *AG_SetEvent(void *, const char *, AG_EventFn, const char *, ....); +AG_Event *AG_AddEvent(void *, const char *, AG_EventFn, const char *, ....); +void AG_UnsetEvent(void *, const char *); +void AG_PostEvent(void *, void *, const char *, const char *, ...); +int AG_ProcessEvent(SDL_Event *); +AG_Event *AG_FindEventHandler(void *, const char *); + +int AG_SchedEvent(void *, void *, Uint32, const char *, + const char *, ...); +int AG_ReschedEvent(void *, const char *, Uint32); +int AG_CancelEvent(void *, const char *); +void AG_ForwardEvent(void *, void *, AG_Event *); +void AG_BindGlobalKey(SDLKey, SDLMod, void (*)(void)); +void AG_BindGlobalKeyEv(SDLKey, SDLMod, void (*)(AG_Event *)); + +/* Execute an event handler routine without processing any arguments. */ static __inline__ void +AG_ExecEventFn(void *obj, AG_Event *ev) +{ +if (ev->handler != NULL) +AG_PostEvent(NULL, obj, ev->name, NULL); +} + +/* Push arguments onto an Event structure. */ +static __inline__ void AG_EventPushPointer(AG_Event *ev, const char *key, void *val) { AG_EVENT_INS_VAL(ev, AG_EVARG_POINTER, key, p, val); Modified: trunk/core/prop.h =================================================================== --- trunk/core/prop.h2008-10-07 04:43:32 UTC (rev 7792) +++ trunk/core/prop.h2008-10-07 04:44:57 UTC (rev 7793) < at >< at > -215,44 +215,67 < at >< at > ********************/ static __inline__ AG_Prop * -AG_SetUint(void *ob, const char *key, Uint i) { +AG_SetUint(void *ob, const char *key, Uint i) +{ return (AG_SetProp(ob, key, AG_PROP_UINT, i)); } -static __inline__ AG_Prop *AG_SetInt(void *ob, const char *key, int i) { +static __inline__ AG_Prop * +AG_SetInt(void *ob, const char *key, int i) +{ return (AG_SetProp(ob, key, AG_PROP_INT, i)); } -static __inline__ AG_Prop *AG_SetUint8(void *ob, const char *key, Uint8 i) { +static __inline__ AG_Prop * +AG_SetUint8(void *ob, const char *key, Uint8 i) +{ return (AG_SetProp(ob, key, AG_PROP_UINT8, i)); } -static __inline__ AG_Prop *AG_SetSint8(void *ob, const char *key, Sint8 i) { +static __inline__ AG_Prop * +AG_SetSint8(void *ob, const char *key, Sint8 i) +{ return (AG_SetProp(ob, key, AG_PROP_SINT8, i)); } -static __inline__ AG_Prop *AG_SetUint16(void *ob, const char *key, Uint16 i) { +static __inline__ AG_Prop * +AG_SetUint16(void *ob, const char *key, Uint16 i) +{ return (AG_SetProp(ob, key, AG_PROP_UINT16, i)); } -static __inline__ AG_Prop *AG_SetSint16(void *ob, const char *key, Sint16 i) { +static __inline__ AG_Prop * +AG_SetSint16(void *ob, const char *key, Sint16 i) +{ return (AG_SetProp(ob, key, AG_PROP_SINT16, i)); } -static __inline__ AG_Prop *AG_SetUint32(void *ob, const char *key, Uint32 i) { +static __inline__ AG_Prop * +AG_SetUint32(void *ob, const char *key, Uint32 i) +{ return (AG_SetProp(ob, key, AG_PROP_UINT32, i)); } -static __inline__ AG_Prop *AG_SetSint32(void *ob, const char *key, Sint32 i) { +static __inline__ AG_Prop * +AG_SetSint32(void *ob, const char *key, Sint32 i) +{ return (AG_SetProp(ob, key, AG_PROP_SINT32, i)); } #ifdef HAVE_64BIT -static __inline__ AG_Prop *AG_SetUint64(void *ob, const char *key, Uint64 i) { +static __inline__ AG_Prop * +AG_SetUint64(void *ob, const char *key, Uint64 i) +{ return (AG_SetProp(ob, key, AG_PROP_UINT64, i)); } -static __inline__ AG_Prop *AG_SetSint64(void *ob, const char *key, Sint64 i) { +static __inline__ AG_Prop * +AG_SetSint64(void *ob, const char *key, Sint64 i) +{ return (AG_SetProp(ob, key, AG_PROP_SINT64, i)); } #endif /* HAVE_64BIT */ -static __inline__ AG_Prop *AG_SetFloat(void *ob, const char *key, float f) { +static __inline__ AG_Prop * +AG_SetFloat(void *ob, const char *key, float f) +{ return (AG_SetProp(ob, key, AG_PROP_FLOAT, f)); } -static __inline__ AG_Prop *AG_SetDouble(void *ob, const char *key, double d) { +static __inline__ AG_Prop * +AG_SetDouble(void *ob, const char *key, double d) +{ return (AG_SetProp(ob, key, AG_PROP_DOUBLE, d)); } < at >< at > -264,69 +287,91 < at >< at > } #endif /* HAVE_LONG_DOUBLE */ -static __inline__ AG_Prop *AG_SetPointer(void *ob, const char *key, void *p) { +static __inline__ AG_Prop * +AG_SetPointer(void *ob, const char *key, void *p) +{ return (AG_SetProp(ob, key, AG_PROP_POINTER, p)); } -static __inline__ AG_Prop *AG_SetBool(void *ob, const char *key, int i) { +static __inline__ AG_Prop * +AG_SetBool(void *ob, const char *key, int i) +{ return (AG_SetProp(ob, key, AG_PROP_BOOL, i)); } -static __inline__ Uint AG_GetUint(void *p, const char *key) { +static __inline__ Uint +AG_GetUint(void *p, const char *key) +{ Uint i; if (AG_GetProp(p, key, AG_PROP_UINT, (Uint *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ int AG_GetInt(void *p, const char *key) { +static __inline__ int +AG_GetInt(void *p, const char *key) +{ int i; if (AG_GetProp(p, key, AG_PROP_INT, (int *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ int AG_GetBool(void *p, const char *key) { +static __inline__ int +AG_GetBool(void *p, const char *key) +{ int i; if (AG_GetProp(p, key, AG_PROP_BOOL, (int *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ Uint8 AG_GetUint8(void *p, const char *key) { +static __inline__ Uint8 +AG_GetUint8(void *p, const char *key) +{ Uint8 i; if (AG_GetProp(p, key, AG_PROP_UINT8, (Uint8 *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ Sint8 AG_GetSint8(void *p, const char *key) { +static __inline__ Sint8 +AG_GetSint8(void *p, const char *key) +{ Sint8 i; if (AG_GetProp(p, key, AG_PROP_SINT8, (Sint8 *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ Uint16 AG_GetUint16(void *p, const char *key) { +static __inline__ Uint16 +AG_GetUint16(void *p, const char *key) +{ Uint16 i; if (AG_GetProp(p, key, AG_PROP_UINT16, (Uint16 *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ Sint16 AG_GetSint16(void *p, const char *key) { +static __inline__ Sint16 +AG_GetSint16(void *p, const char *key) +{ Sint16 i; if (AG_GetProp(p, key, AG_PROP_SINT16, (Sint16 *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ Uint32 AG_GetUint32(void *p, const char *key) { +static __inline__ Uint32 +AG_GetUint32(void *p, const char *key) +{ Uint32 i; if (AG_GetProp(p, key, AG_PROP_UINT32, (Uint32 *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ Sint32 AG_GetSint32(void *p, const char *key) { +static __inline__ Sint32 +AG_GetSint32(void *p, const char *key) +{ Sint32 i; if (AG_GetProp(p, key, AG_PROP_SINT32, (Sint32 *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); < at >< at > -335,14 +380,18 < at >< at > } #ifdef HAVE_64BIT -static __inline__ Uint64 AG_GetUint64(void *p, const char *key) { +static __inline__ Uint64 +AG_GetUint64(void *p, const char *key) +{ Uint64 i; if (AG_GetProp(p, key, AG_PROP_UINT64, (Uint64 *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); } return (i); } -static __inline__ Sint64 AG_GetSint64(void *p, const char *key) { +static __inline__ Sint64 +AG_GetSint64(void *p, const char *key) +{ Sint64 i; if (AG_GetProp(p, key, AG_PROP_SINT64, (Sint64 *)&i) == NULL) { AG_FatalError("%s", AG_GetError()); < at >< at > -351,14 +400,18 < at >< at > } #endif /* HAVE_64BIT */ -static __inline__ float AG_GetFloat(void *p, const char *key) { +static __inline__ float +AG_GetFloat(void *p, const char *key) +{ float f; if (AG_GetProp(p, key, AG_PROP_FLOAT, (float *)&f) == NULL) { AG_FatalError("%s", AG_GetError()); } return (f); } -static __inline__ double AG_GetDouble(void *p, const char *key) { +static __inline__ double +AG_GetDouble(void *p, const char *key) +{ double d; if (AG_GetProp(p, key, AG_PROP_DOUBLE, (double *)&d) == NULL) { AG_FatalError("%s", AG_GetError()); < at >< at > -367,7 +420,9 < at >< at > } #ifdef HAVE_LONG_DOUBLE -static __inline__ long double AG_GetLongDouble(void *p, const char *key) { +static __inline__ long double +AG_GetLongDouble(void *p, const char *key) +{ long double d; if (AG_GetProp(p, key, AG_PROP_LONG_DOUBLE, (long double *)&d) == NULL) { < at >< at > -377,14 +432,18 < at >< at > } #endif /* HAVE_LONG_DOUBLE */ -static __inline__ char *AG_GetString(void *p, const char *key) { +static __inline__ char * +AG_GetString(void *p, const char *key) +{ char *s; if (AG_GetProp(p, key, AG_PROP_STRING, (char *)&s) == NULL) { AG_FatalError("%s", AG_GetError()); } return (s); } -static __inline__ void *AG_GetPointer(void *p, const char *key) { +static __inline__ void * +AG_GetPointer(void *p, const char *key) +{ void *np; if (AG_GetProp(p, key, AG_PROP_POINTER, (void *)&np) == NULL) { AG_FatalError("%s", AG_GetError()); Modified: trunk/gui/gui_math.h =================================================================== --- trunk/gui/gui_math.h2008-10-07 04:43:32 UTC (rev 7792) +++ trunk/gui/gui_math.h2008-10-07 04:44:57 UTC (rev 7793) < at >< at > -77,10 +77,26 < at >< at > while (val < i) { val <<= 1; } return (val); } -static __inline__ float AG_Hypot(float x, float y) { return AG_Sqrt(x*x+y*y); } -static __inline__ int AG_Truncf(double d) { return ((int)floor(d)); } -static __inline__ double AG_Fracf(double d) { return (d - floor(d)); } -static __inline__ double AG_FracInvf(double d) { return (1 - (d - floor(d))); } +static __inline__ float +AG_Hypot(float x, float y) +{ +return AG_Sqrt(x*x+y*y); +} +static __inline__ int +AG_Truncf(double d) +{ +return ((int)floor(d)); +} +static __inline__ double +AG_Fracf(double d) +{ +return (d - floor(d)); +} +static __inline__ double +AG_FracInvf(double d) +{ +return (1 - (d - floor(d))); +} __END_DECLS #include "close_code.h" Modified: trunk/math/m_line.h =================================================================== --- trunk/math/m_line.h2008-10-07 04:43:32 UTC (rev 7792) +++ trunk/math/m_line.h2008-10-07 04:44:57 UTC (rev 7793) < at >< at > -38,8 +38,16 < at >< at > } /* Test whether the given Line is actually a ray. */ -static __inline__ int M_LineIsRay2(M_Line2 L) { return (L.t == M_INFINITY); } -static __inline__ int M_LineIsRay3(M_Line3 L) { return (L.t == M_INFINITY); } +static __inline__ int +M_LineIsRay2(M_Line2 L) +{ +return (L.t == M_INFINITY); +} +static __inline__ int +M_LineIsRay3(M_Line3 L) +{ +return (L.t == M_INFINITY); +} /* Return the first and second Points of the given Line. */ static __inline__ M_Vector2

Agar: r7792 - trunk/demos

Agar-SVN — 2008-10-07T04:44:00

Author: vedge Date: 2008-10-07 01:43:32 -0300 (Tue, 07 Oct 2008) New Revision: 7792 Modified: trunk/demos/Makefile Log: "make proj" requires Makefile.config Modified: trunk/demos/Makefile =================================================================== --- trunk/demos/Makefile2008-10-07 04:41:02 UTC (rev 7791) +++ trunk/demos/Makefile2008-10-07 04:43:32 UTC (rev 7792) < at >< at > -63,7 +63,7 < at >< at > proj: for D in ${SUBDIR}; do \ echo "==> $$D"; \ -(cd $$D && ${MAKE} proj); \ +(cd $$D && touch Makefile.config && ${MAKE} proj); \ done proj-vs2005:

Agar: r7791 - trunk/gui

Agar-SVN — 2008-10-07T04:41:31

Author: vedge Date: 2008-10-07 01:41:02 -0300 (Tue, 07 Oct 2008) New Revision: 7791 Modified: trunk/gui/label.c trunk/gui/label.h Log: use PushClipRect() exclusively Modified: trunk/gui/label.c =================================================================== --- trunk/gui/label.c2008-10-07 04:40:12 UTC (rev 7790) +++ trunk/gui/label.c2008-10-07 04:41:02 UTC (rev 7791) < at >< at > -209,20 +209,15 < at >< at > { AG_Label *lbl = obj; int wLbl, hLbl; -AG_Rect rView; if (a->w < 1 || a->h < 1) { return (-1); } -rView.x = lbl->lPad; -rView.y = lbl->tPad; -rView.w = a->w - lbl->rPad; -rView.h = a->h - lbl->bPad; +lbl->rClip.x = lbl->lPad; +lbl->rClip.y = lbl->tPad; +lbl->rClip.w = a->w - lbl->rPad; +lbl->rClip.h = a->h - lbl->bPad; -if (lbl->type == AG_LABEL_POLLED) { -AG_WidgetEnableClipping(lbl, rView); -return (0); -} if (lbl->text == NULL) return (0); < at >< at > -232,14 +227,8 < at >< at > */ AG_TextSize(lbl->text, &wLbl, &hLbl); -if (hLbl+lbl->tPad+lbl->bPad > a->h) { -AG_WidgetEnableClipping(lbl, rView); -} else { -AG_WidgetDisableClipping(lbl); -} if ((wLbl + lbl->lPad + lbl->rPad) > a->w) { lbl->flags |= AG_LABEL_PARTIAL; -AG_WidgetDisableClipping(lbl); if (lbl->surfaceCont == -1) { /* TODO share this between all widgets */ AG_PushTextState(); < at >< at > -651,12 +640,12 < at >< at > { AG_Label *lbl = obj; int x, y, cw = 0;/* make compiler happy */ - + if (lbl->flags & AG_LABEL_FRAME) AG_DrawFrame(lbl, AG_RECT(0, 0, WIDTH(lbl), HEIGHT(lbl)), -1, AG_COLOR(FRAME_COLOR)); - + if (lbl->flags & AG_LABEL_PARTIAL) { cw = WSURFACE(lbl,lbl->surfaceCont)->w; if (WIDTH(lbl) <= cw) { < at >< at > -669,6 +658,8 < at >< at > } AG_PushClipRect(lbl, AG_RECT(0, 0, WIDTH(lbl)-cw, HEIGHT(lbl))); +} else { +AG_PushClipRect(lbl, lbl->rClip); } AG_PushTextState(); < at >< at > -705,8 +696,9 < at >< at > break; } +AG_PopClipRect(); + if (lbl->flags & AG_LABEL_PARTIAL) { -AG_PopClipRect(); GetPosition(lbl, WSURFACE(lbl,lbl->surfaceCont), &x, &y); AG_WidgetBlitSurface(lbl, lbl->surfaceCont, WIDTH(lbl) - cw, Modified: trunk/gui/label.h =================================================================== --- trunk/gui/label.h2008-10-07 04:40:12 UTC (rev 7790) +++ trunk/gui/label.h2008-10-07 04:41:02 UTC (rev 7791) < at >< at > -64,6 +64,7 < at >< at > } poll; AG_SLIST_HEAD(,ag_label_flag) lflags;/* Label flag descriptions */ struct ag_text_cache *tCache;/* Cache for polled labels */ +AG_Rect rClip;/* Clipping rectangle */ } AG_Label; __BEGIN_DECLS

Agar: r7790 - trunk/gui

Agar-SVN — 2008-10-07T04:40:42

Author: vedge Date: 2008-10-07 01:40:12 -0300 (Tue, 07 Oct 2008) New Revision: 7790 Modified: trunk/gui/table.c Log: use standard WidgetSizeAlloc() and WidgetDraw() API for drawing cell widgets Modified: trunk/gui/table.c =================================================================== --- trunk/gui/table.c2008-10-06 15:00:52 UTC (rev 7789) +++ trunk/gui/table.c2008-10-07 04:40:12 UTC (rev 7790) < at >< at > -196,8 +196,6 < at >< at > #endif SizeFillCols(t); AG_TableUpdateScrollbars(t); - -AG_WidgetEnableClipping(t, AG_RECT(0,0,a->w,a->h)); return (0); } < at >< at > -324,17 +322,18 < at >< at > goto blit; case AG_CELL_WIDGET: if (WIDGET_OPS(c->data.p)->draw != NULL) { +AG_SizeAlloc wa; AG_Widget *W = c->data.p; -W->x = rd->x; -W->y = rd->y; -W->w = rd->w; -W->h = rd->h; -W->cx = WIDGET(t)->cx + rd->x; -W->cy = WIDGET(t)->cy + rd->y; -W->cx2 = W->cx + W->w; -W->cy2 = W->cy + W->h; -AGWIDGET_OPS(W)->draw(W); +wa.x = rd->x; +wa.y = rd->y; +wa.w = rd->w; +wa.h = rd->h; +AG_WidgetSizeAlloc(W, &wa); +AG_WidgetUpdateCoords(W, + WIDGET(t)->cx + rd->x, + WIDGET(t)->cy + rd->y); +AG_WidgetDraw(W); } c->surface = -1; return;

Agar: r7789 - trunk/gui

Agar-SVN — 2008-10-06T15:01:18

Author: vedge Date: 2008-10-06 12:00:52 -0300 (Mon, 06 Oct 2008) New Revision: 7789 Modified: trunk/gui/AG_Scrollview.3 trunk/gui/scrollview.c trunk/gui/scrollview.h Log: - use the computed view coordinates in ClipWidgets(). - implement SetIncrement(), SCROLLVIEW_FRAME. Modified: trunk/gui/AG_Scrollview.3 =================================================================== --- trunk/gui/AG_Scrollview.32008-10-06 14:50:25 UTC (rev 7788) +++ trunk/gui/AG_Scrollview.32008-10-06 15:00:52 UTC (rev 7789) < at >< at > -55,6 +55,9 < at >< at > .Ft "void" .Fn AG_ScrollviewSizeHint "AG_Scrollview *sv" "Uint width" "Uint height" .Pp +.Ft "void" +.Fn AG_ScrollviewSetIncrement "AG_Scrollview *sv" "int increment" +.Pp .nr nS 0 The .Fn AG_ScrollviewNew < at >< at > -81,6 +84,8 < at >< at > .It Dv AG_SCROLLVIEW_BY_KBD Panning with keyboard is permitted (may interfere with the operation of child widgets). +.It Dv AG_SCROLLVIEW_FRAME +Draw background and frame. .El .Pp The < at >< at > -89,6 +94,9 < at >< at > .Nm in pixels. .Pp +.Fn AG_ScrollviewSetIncrement +sets the increment for scrolling the view, in pixels. +.Pp .Sh EVENTS The .Nm Modified: trunk/gui/scrollview.c =================================================================== --- trunk/gui/scrollview.c2008-10-06 14:50:25 UTC (rev 7788) +++ trunk/gui/scrollview.c2008-10-06 15:00:52 UTC (rev 7789) < at >< at > -33,20 +33,20 < at >< at > #include #include -/* Disable drawing of widgets completely outside of the view. */ +/* Clip widgets completely outside of the view in a more efficient way. */ static void -ClipWidgets(AG_Scrollview *sv, AG_Widget *wid, int xRel, int yRel) +ClipWidgets(AG_Scrollview *sv, AG_Widget *wid) { AG_Widget *chld; -if (wid->x+wid->w < 0 || - wid->y+wid->h < 0) { +if (wid->cx + wid->w < WIDGET(sv)->cx || + wid->cy + wid->h < WIDGET(sv)->cy) { wid->flags |= AG_WIDGET_HIDE; } else { wid->flags &= ~(AG_WIDGET_HIDE); } OBJECT_FOREACH_CHILD(chld, wid, ag_widget) -ClipWidgets(sv, chld, wid->x, wid->y); +ClipWidgets(sv, chld); } /* Place child widgets at the current offset in the Scrollview. */ < at >< at > -76,7 +76,7 < at >< at > aChld.y += aChld.h; break; } -ClipWidgets(sv, chld, 0,0); +ClipWidgets(sv, chld); } switch (sv->pack) { case AG_PACK_HORIZ: < at >< at > -168,6 +168,9 < at >< at > AG_Scrollview *sv = AG_PTR(1); AG_Window *pWin = AG_ParentWindow(sv); +if (pWin != NULL) +AG_WindowUpdate(pWin); + PlaceWidgets(sv, NULL, NULL); if (pWin != NULL) < at >< at > -212,11 +215,21 < at >< at > if (flags & AG_SCROLLVIEW_BY_KBD) { AG_SetEvent(sv, "window-keydown", KeyDown, NULL); } - +AG_ScrollviewSetIncrement(sv, 10); AG_ObjectAttach(parent, sv); return (sv); } +void +AG_ScrollviewSetIncrement(AG_Scrollview *sv, int incr) +{ +AG_ObjectLock(sv); +sv->incr = incr; +if (sv->hbar != NULL) { AG_ScrollbarSetIntIncrement(sv->hbar, incr); } +if (sv->vbar != NULL) { AG_ScrollbarSetIntIncrement(sv->vbar, incr); } +AG_ObjectUnlock(sv); +} + static void Init(void *obj) { < at >< at > -235,6 +248,7 < at >< at > sv->vbar = NULL; sv->pack = AG_PACK_VERT; sv->rView = AG_RECT(0,0,0,0); +sv->incr = 10; } void < at >< at > -349,13 +363,15 < at >< at > AG_Scrollview *sv = p; AG_Widget *chld; -AG_DrawBox(sv, - AG_RECT(0, 0, WIDTH(sv), HEIGHT(sv)), -1, - AG_COLOR(FRAME_COLOR)); +if (sv->flags & AG_SCROLLVIEW_FRAME) { +AG_DrawBox(sv, + AG_RECT(0, 0, WIDTH(sv), HEIGHT(sv)), -1, + AG_COLOR(FRAME_COLOR)); +} if (sv->hbar != NULL) { AG_WidgetDraw(sv->hbar); } if (sv->vbar != NULL) { AG_WidgetDraw(sv->vbar); } - + AG_PushClipRect(sv, sv->rView); WIDGET_FOREACH_CHILD(chld, sv) { if (chld == WIDGET(sv->hbar) || chld == WIDGET(sv->vbar)) { Modified: trunk/gui/scrollview.h =================================================================== --- trunk/gui/scrollview.h2008-10-06 14:50:25 UTC (rev 7788) +++ trunk/gui/scrollview.h2008-10-06 15:00:52 UTC (rev 7789) < at >< at > -19,6 +19,7 < at >< at > #define AG_SCROLLVIEW_PANNING0x10 /* Panning in progress */ #define AG_SCROLLVIEW_BY_CURSOR0x20 /* Panning with cursor allowed */ #define AG_SCROLLVIEW_BY_KBD0x40 /* Panning with keyboard allowed */ +#define AG_SCROLLVIEW_FRAME0x80 /* Draw background and frame */ #define AG_SCROLLVIEW_EXPAND(AG_SCROLLVIEW_HFILL|AG_SCROLLVIEW_VFILL) #define AG_SCROLLVIEW_NOPAN_XY(AG_SCROLLVIEW_NOPAN_X|AG_SCROLLVIEW_NOPAN_Y) < at >< at > -28,13 +29,15 < at >< at > int xMin, xMax, yMin, yMax;/* Display boundaries */ AG_Rect rView;/* Available space for widgets */ AG_Scrollbar *hbar, *vbar;/* Scrollbars for panning */ +int incr;/* Scrolling increment */ } AG_Scrollview; __BEGIN_DECLS extern AG_WidgetClass agScrollviewClass; -AG_Scrollview*AG_ScrollviewNew(void *, Uint); -void AG_ScrollviewSizeHint(AG_Scrollview *, Uint, Uint); +AG_Scrollview *AG_ScrollviewNew(void *, Uint); +void AG_ScrollviewSizeHint(AG_Scrollview *, Uint, Uint); +void AG_ScrollviewSetIncrement(AG_Scrollview *, int); __END_DECLS #include "close_code.h"

Agar: r7788 - trunk/gui

Agar-SVN — 2008-10-06T14:50:51

Author: vedge Date: 2008-10-06 11:50:25 -0300 (Mon, 06 Oct 2008) New Revision: 7788 Modified: trunk/gui/style.h trunk/gui/style_default.c Log: merge Scrollbar*() and Scrollbar*Buttons() operations; fix undersize case.. Modified: trunk/gui/style.h =================================================================== --- trunk/gui/style.h2008-10-06 14:46:30 UTC (rev 7787) +++ trunk/gui/style.h2008-10-06 14:50:25 UTC (rev 7788) < at >< at > -40,9 +40,8 < at >< at > void (*RadioButton)(struct ag_radio *, int x, int y, int selected, int over); void (*ProgressBarBackground)(void *); -void (*ScrollbarBackground)(void *); -void (*ScrollbarVertButtons)(struct ag_scrollbar *, int y, int h); -void (*ScrollbarHorizButtons)(struct ag_scrollbar *, int x, int w); +void (*ScrollbarVert)(struct ag_scrollbar *, int y, int h); +void (*ScrollbarHoriz)(struct ag_scrollbar *, int x, int w); void (*SliderBackgroundHoriz)(void *); void (*SliderBackgroundVert)(void *); void (*SliderControlHoriz)(void *, int, int); Modified: trunk/gui/style_default.c =================================================================== --- trunk/gui/style_default.c2008-10-06 14:46:30 UTC (rev 7787) +++ trunk/gui/style_default.c2008-10-06 14:50:25 UTC (rev 7788) < at >< at > -353,16 +353,6 < at >< at > AG_COLOR(FRAME_COLOR)); } - -/* Background for Scrollbar */ -static void -ScrollbarBackground(void *sb) -{ -AG_DrawBox(sb, - AG_RECT(0, 0, WIDTH(sb), HEIGHT(sb)), -1, - AG_COLOR(SCROLLBAR_COLOR)); -} - /* Background for horizontal Slider */ static void SliderBackgroundHoriz(void *sl) < at >< at > -407,74 +397,170 < at >< at > AG_COLOR(SCROLLBAR_BTN_COLOR)); } +/* Vertical scrollbar (undersize case). */ +static void +ScrollbarVertUndersize(AG_Scrollbar *sb) +{ +int w = WIDTH(sb)/2; +int size = MIN(HEIGHT(sb)/4, WIDTH(sb)); + +AG_DrawBox(sb, AG_RECT(0,0,WIDTH(sb),HEIGHT(sb)), 1, + AG_COLOR(SCROLLBAR_BTN_COLOR)); +AG_DrawArrowUp(sb, + w, + size, + size, + AG_COLOR(SCROLLBAR_ARR1_COLOR), + AG_COLOR(SCROLLBAR_ARR2_COLOR)); +AG_DrawArrowDown(sb, + w, + HEIGHT(sb)/2 + size, + size, + AG_COLOR(SCROLLBAR_ARR1_COLOR), + AG_COLOR(SCROLLBAR_ARR2_COLOR)); +} + /* Buttons of vertical Scrollbar */ static void -ScrollbarVertButtons(AG_Scrollbar *sb, int y, int h) +ScrollbarVert(AG_Scrollbar *sb, int y, int h) { +int mid = WIDTH(sb)/2; +int b2 = sb->wButton*2; +int hArrow = MIN(WIDTH(sb), sb->hArrow); int y2; +if (HEIGHT(sb) < b2) { +ScrollbarVertUndersize(sb); +return; +} + +/* Background */ AG_DrawBox(sb, + AG_RECT(0, 0, WIDTH(sb), HEIGHT(sb)), -1, + AG_COLOR(SCROLLBAR_COLOR)); + +/* Upper button. */ +AG_DrawBox(sb, AG_RECT(0, 0, WIDTH(sb), sb->wButton), (sb->curBtn == AG_SCROLLBAR_BUTTON_DEC) ? -1 : 1, AG_COLOR(SCROLLBAR_BTN_COLOR)); -AG_DrawArrowUp(sb, WIDTH(sb)/2, sb->wButton/2, sb->hArrow, +AG_DrawArrowUp(sb, + mid, + sb->wButton/2, + hArrow, AG_COLOR(SCROLLBAR_ARR1_COLOR), AG_COLOR(SCROLLBAR_ARR2_COLOR)); +/* Lower button. */ y2 = HEIGHT(sb) - sb->wButton; AG_DrawBox(sb, AG_RECT(0, y2, WIDTH(sb), sb->wButton), (sb->curBtn == AG_SCROLLBAR_BUTTON_INC) ? -1 : 1, AG_COLOR(SCROLLBAR_BTN_COLOR)); -AG_DrawArrowDown(sb, WIDTH(sb)/2, (y2 + sb->wButton/2), sb->hArrow, +AG_DrawArrowDown(sb, + mid, + y2 + sb->wButton/2, + hArrow, AG_COLOR(SCROLLBAR_ARR1_COLOR), AG_COLOR(SCROLLBAR_ARR2_COLOR)); +/* Scrollbar. */ if (h > 0) { AG_DrawBox(sb, - AG_RECT(0, sb->wButton+y, WIDTH(sb), h), + AG_RECT(0, + sb->wButton + y, + WIDTH(sb), + MIN(h, HEIGHT(sb)-b2)), (sb->curBtn == AG_SCROLLBAR_BUTTON_SCROLL) ? -1 : 1, AG_COLOR(SCROLLBAR_BTN_COLOR)); } else { AG_DrawBox(sb, - AG_RECT(0, sb->wButton, WIDTH(sb), - HEIGHT(sb) - sb->wButton*2), + AG_RECT(0, + sb->wButton, + WIDTH(sb), + HEIGHT(sb)-b2), (sb->curBtn == AG_SCROLLBAR_BUTTON_SCROLL) ? -1 : 1, AG_COLOR(SCROLLBAR_BTN_COLOR)); } } +/* Horizontal scrollbar (undersize case). */ +static void +ScrollbarHorizUndersize(AG_Scrollbar *sb) +{ +int h = HEIGHT(sb)/2; +int size = MIN(WIDTH(sb)/4, HEIGHT(sb)); + +AG_DrawBox(sb, AG_RECT(0,0,WIDTH(sb),HEIGHT(sb)), 1, + AG_COLOR(SCROLLBAR_BTN_COLOR)); +AG_DrawArrowLeft(sb, + size, + h, + size, + AG_COLOR(SCROLLBAR_ARR1_COLOR), + AG_COLOR(SCROLLBAR_ARR2_COLOR)); +AG_DrawArrowRight(sb, + WIDTH(sb)/2 + size, + h, + size, + AG_COLOR(SCROLLBAR_ARR1_COLOR), + AG_COLOR(SCROLLBAR_ARR2_COLOR)); +} + /* Buttons of horizontal Scrollbar */ static void -ScrollbarHorizButtons(AG_Scrollbar *sb, int x, int w) +ScrollbarHoriz(AG_Scrollbar *sb, int x, int w) { +int mid = HEIGHT(sb)/2; +int b2 = sb->wButton*2; +int hArrow = MIN(HEIGHT(sb), sb->hArrow); int x2; +if (WIDTH(sb) < b2) { +ScrollbarHorizUndersize(sb); +return; +} + +/* Background */ AG_DrawBox(sb, + AG_RECT(0, 0, WIDTH(sb), HEIGHT(sb)), -1, + AG_COLOR(SCROLLBAR_COLOR)); + +/* Left button */ +AG_DrawBox(sb, AG_RECT(0, 0, sb->wButton, HEIGHT(sb)), (sb->curBtn == AG_SCROLLBAR_BUTTON_DEC) ? -1 : 1, AG_COLOR(SCROLLBAR_BTN_COLOR)); -AG_DrawArrowLeft(sb, sb->wButton/2, HEIGHT(sb)/2, sb->hArrow, +AG_DrawArrowLeft(sb, + sb->wButton/2, mid, + hArrow, AG_COLOR(SCROLLBAR_ARR1_COLOR), AG_COLOR(SCROLLBAR_ARR2_COLOR)); +/* Right button */ x2 = WIDTH(sb)-sb->wButton; AG_DrawBox(sb, AG_RECT(x2, 0, sb->wButton, HEIGHT(sb)), (sb->curBtn == AG_SCROLLBAR_BUTTON_INC) ? -1 : 1, AG_COLOR(SCROLLBAR_BTN_COLOR)); -AG_DrawArrowRight(sb, (x2 + sb->wButton/2), HEIGHT(sb)/2, sb->hArrow, +AG_DrawArrowRight(sb, (x2 + sb->wButton/2), mid, hArrow, AG_COLOR(SCROLLBAR_ARR1_COLOR), AG_COLOR(SCROLLBAR_ARR2_COLOR)); +/* Scrollbar */ if (w > 0) { AG_DrawBox(sb, - AG_RECT(sb->wButton+x, 0, w, HEIGHT(sb)), + AG_RECT(sb->wButton + x, + 0, + MIN(w, WIDTH(sb)-b2), + HEIGHT(sb)), (sb->curBtn == AG_SCROLLBAR_BUTTON_SCROLL) ? -1 : 1, AG_COLOR(SCROLLBAR_BTN_COLOR)); } else { AG_DrawBox(sb, - AG_RECT(sb->wButton, 0, WIDTH(sb) - sb->wButton*2, + AG_RECT(sb->wButton, + 0, + WIDTH(sb)-b2, HEIGHT(sb)), (sb->curBtn == AG_SCROLLBAR_BUTTON_SCROLL) ? -1 : 1, AG_COLOR(SCROLLBAR_BTN_COLOR)); < at >< at > -679,9 +765,8 < at >< at > RadioGroupBackground, RadioButton, ProgressBarBackground, -ScrollbarBackground, -ScrollbarVertButtons, -ScrollbarHorizButtons, +ScrollbarVert, +ScrollbarHoriz, SliderBackgroundHoriz, SliderBackgroundVert, SliderControlHoriz,

Agar: r7787 - trunk/gui

Agar-SVN — 2008-10-06T14:46:56

Author: vedge Date: 2008-10-06 11:46:30 -0300 (Mon, 06 Oct 2008) New Revision: 7787 Modified: trunk/gui/table.c Log: set our scrollbars non-focusable. Modified: trunk/gui/table.c =================================================================== --- trunk/gui/table.c2008-10-06 14:43:24 UTC (rev 7786) +++ trunk/gui/table.c2008-10-06 14:46:30 UTC (rev 7787) < at >< at > -1669,12 +1669,11 < at >< at > t->prew = -1;/* Use column size specs */ t->preh = 64; t->wTbl = -1; + t->vbar = AG_ScrollbarNew(t, AG_SCROLLBAR_VERT, 0); -#if 0 -t->hbar = AG_ScrollbarNew(t, AG_SCROLLBAR_HORIZ, 0); -#else -t->hbar = NULL; -#endif +AG_WidgetSetFocusable(t->vbar, 0); +/*t->hbar = AG_ScrollbarNew(t, AG_SCROLLBAR_HORIZ, 0); */ + t->poll_ev = NULL; t->nResizing = -1; t->cols = NULL;

Agar: r7786 - in trunk: ada-gui gui

Agar-SVN — 2008-10-06T14:43:50

Author: vedge Date: 2008-10-06 11:43:24 -0300 (Mon, 06 Oct 2008) New Revision: 7786 Modified: trunk/ada-gui/agar-gui-widget-scrollbar.ads trunk/gui/AG_Scrollbar.3 trunk/gui/scrollbar.c trunk/gui/scrollbar.h Log: - remove SCROLLBAR_FOCUSABLE flag, set focusable by default. - merge ScrollbarBackground(), Scrollbar{Horiz,Vert}Buttons() into one style op. - add boundary check to SeekToPosition() itself. - wButtonDef is redundant. - fix rendering in numerically undefined case. Modified: trunk/ada-gui/agar-gui-widget-scrollbar.ads =================================================================== --- trunk/ada-gui/agar-gui-widget-scrollbar.ads2008-10-06 14:16:41 UTC (rev 7785) +++ trunk/ada-gui/agar-gui-widget-scrollbar.ads2008-10-06 14:43:24 UTC (rev 7786) < at >< at > -28,7 +28,6 < at >< at > type flags_t is new c.unsigned; SCROLLBAR_HFILL : constant flags_t := 16#01#; SCROLLBAR_VFILL : constant flags_t := 16#02#; - SCROLLBAR_FOCUSABLE : constant flags_t := 16#04#; SCROLLBAR_EXPAND : constant flags_t := SCROLLBAR_HFILL or SCROLLBAR_VFILL; type scrollbar_t is limited private; Modified: trunk/gui/AG_Scrollbar.3 =================================================================== --- trunk/gui/AG_Scrollbar.32008-10-06 14:16:41 UTC (rev 7785) +++ trunk/gui/AG_Scrollbar.32008-10-06 14:43:24 UTC (rev 7786) < at >< at > -134,17 +134,10 < at >< at > }; .Ed .Pp -Acceptable values for the +There are currently no .Fa flags -argument include: +specific to this widget. .Pp -.Bl -tag -width "AG_SCROLLBAR_FOCUSABLE " -.It AG_SCROLLBAR_FOCUSABLE -Allow the scrollbar to gain focus (disabled by default). -This is equivalent to calling -.Xr AG_WidgetSetFocusable . -.El -.Pp The .Fn AG_ScrollbarNew* variants create a scrollbar and also bind Modified: trunk/gui/scrollbar.c =================================================================== --- trunk/gui/scrollbar.c2008-10-06 14:16:41 UTC (rev 7785) +++ trunk/gui/scrollbar.c2008-10-06 14:43:24 UTC (rev 7786) < at >< at > -46,7 +46,6 < at >< at > if (flags & AG_SCROLLBAR_HFILL) { AG_ExpandHoriz(sb); } if (flags & AG_SCROLLBAR_VFILL) { AG_ExpandVert(sb); } -if (flags & AG_SCROLLBAR_FOCUSABLE) { AG_WidgetSetFocusable(sb, 1); } AG_ObjectAttach(parent, sb); return (sb); < at >< at > -317,6 +316,12 < at >< at > (*(type *)pMax - *(type *)pVis - *(type *)pMin) /\ sb->extent;\ *(type *)pVal += *(type *)pMin;\ +if (*(type *)pVal < *(type *)pMin) {\ +*(type *)pVal = *(type *)pMin;\ +}\ +if (*(type *)pVal > *(type *)pMax) {\ +*(type *)pVal = *(type *)pMax;\ +}\ } static __inline__ void < at >< at > -682,7 +687,8 < at >< at > AG_Scrollbar *sb = obj; WIDGET(sb)->flags |= AG_WIDGET_UNFOCUSED_BUTTONUP| - AG_WIDGET_UNFOCUSED_MOTION; + AG_WIDGET_UNFOCUSED_MOTION| + AG_WIDGET_FOCUSABLE; AG_WidgetBindInt(sb, "value", &sb->value); AG_WidgetBindInt(sb, "min", &sb->min); < at >< at > -696,15 +702,16 < at >< at > sb->min = 0; sb->max = 0; sb->visible = 0; -sb->wButtonDef = 16;/* XXX */ -sb->wButton = 16; -sb->wBar = 8; sb->buttonIncFn = NULL; sb->buttonDecFn = NULL; sb->xOffs = 0; sb->rInc = 1.0; sb->iInc = 1; +sb->wBar = 8; +sb->wButton = 16; +sb->hArrow = sb->wButton*5/9; + AG_SetEvent(sb, "window-mousebuttondown", MouseButtonDown, NULL); AG_SetEvent(sb, "window-mousebuttonup", MouseButtonUp, NULL); AG_SetEvent(sb, "window-mousemotion", MouseMotion, NULL); < at >< at > -726,12 +733,12 < at >< at > switch (sb->type) { case AG_SCROLLBAR_HORIZ: -r->w = sb->wButtonDef*2; -r->h = sb->wButtonDef; +r->w = sb->wButton*2; +r->h = sb->wButton; break; case AG_SCROLLBAR_VERT: -r->w = sb->wButtonDef; -r->h = sb->wButtonDef*2; +r->w = sb->wButton; +r->h = sb->wButton*2; break; } } < at >< at > -744,27 +751,9 < at >< at > if (a->w < 4 || a->h < 4) { return (-1); } -switch (sb->type) { -case AG_SCROLLBAR_VERT: -if (a->h < sb->wButtonDef*2) { -sb->wButton = a->h/2; -} else { -sb->wButton = sb->wButtonDef; -} -sb->extent = a->h; -break; -case AG_SCROLLBAR_HORIZ: -if (a->w < sb->wButtonDef*2) { -sb->wButton = a->w/2; -} else { -sb->wButton = sb->wButtonDef; -} -sb->extent = a->w; -break; -} -sb->extent -= sb->wButton*2; -sb->extent -= sb->wBar; -sb->hArrow = sb->wButton*5/9; +sb->extent = ((sb->type==AG_SCROLLBAR_VERT) ? a->h : a->w) - + sb->wButton*2 - sb->wBar; +if (sb->extent < 0) { sb->extent = 0; } return (0); } < at >< at > -778,10 +767,11 < at >< at > AG_TextColor(TEXT_COLOR); AG_TextBGColorHex(0xccccccff); -Snprintf(label, sizeof(label), "%d < %d < %d", +Snprintf(label, sizeof(label), "%d < %d < %d(%d)", AG_WidgetInt(sb,"min"), AG_WidgetInt(sb,"value"), - AG_WidgetInt(sb,"max")); + AG_WidgetInt(sb,"max"), + AG_WidgetInt(sb,"visible")); /* XXX inefficient */ txt = AG_TextRender(label); < at >< at > -799,22 +789,20 < at >< at > AG_Scrollbar *sb = obj; int x, size; -STYLE(sb)->ScrollbarBackground(sb); - if (GetPosition(sb, &x) == 0) { size = (sb->wBar == -1) ? sb->extent : sb->wBar; if (size < 0) { size = 0; } } else { x = 0; -size = sb->extent - 1; +size = sb->extent + sb->wBar; } switch (sb->type) { case AG_SCROLLBAR_VERT: -STYLE(sb)->ScrollbarVertButtons(sb, x, size); +STYLE(sb)->ScrollbarVert(sb, x, size); break; case AG_SCROLLBAR_HORIZ: -STYLE(sb)->ScrollbarHorizButtons(sb, x, size); +STYLE(sb)->ScrollbarHoriz(sb, x, size); break; } if (sb->flags & AG_SCROLLBAR_TEXT) Modified: trunk/gui/scrollbar.h =================================================================== --- trunk/gui/scrollbar.h2008-10-06 14:16:41 UTC (rev 7785) +++ trunk/gui/scrollbar.h2008-10-06 14:43:24 UTC (rev 7786) < at >< at > -24,7 +24,6 < at >< at > Uint flags; #define AG_SCROLLBAR_HFILL0x01 #define AG_SCROLLBAR_VFILL0x02 -#define AG_SCROLLBAR_FOCUSABLE0x04 #define AG_SCROLLBAR_TEXT0x08/* Print values */ #define AG_SCROLLBAR_EXPAND(AG_SCROLLBAR_HFILL|AG_SCROLLBAR_VFILL) < at >< at > -33,8 +32,7 < at >< at > int visible;/* Subtracts from range */ enum ag_scrollbar_type type;/* Style of scrollbar */ enum ag_scrollbar_button curBtn; /* Active button */ -int wButton;/* Effective button size */ -int wButtonDef;/* Default button size */ +int wButton;/* Button size */ int wBar;/* Scroll bar size */ int hArrow;/* Arrow height */ AG_Event *buttonIncFn;/* Alt. handler for increment btns */ < at >< at > -125,7 +123,6 < at >< at > AG_ScrollbarSetButtonSize(AG_Scrollbar *sb, int wButton) { AG_ObjectLock(sb); -sb->wButtonDef = wButton; sb->wButton = wButton; AG_ObjectUnlock(sb); }

Agar: r7785 - in trunk: ada-gui gui

Agar-SVN — 2008-10-06T14:17:06

Author: vedge Date: 2008-10-06 11:16:41 -0300 (Mon, 06 Oct 2008) New Revision: 7785 Modified: trunk/ada-gui/agar-gui-window.ads trunk/gui/AG_Window.3 trunk/gui/window.c trunk/gui/window.h Log: introduce WINDOW_NOCLIPPING flag. Modified: trunk/ada-gui/agar-gui-window.ads =================================================================== --- trunk/ada-gui/agar-gui-window.ads2008-10-06 13:56:39 UTC (rev 7784) +++ trunk/ada-gui/agar-gui-window.ads2008-10-06 14:16:41 UTC (rev 7785) < at >< at > -21,26 +21,33 < at >< at > -- subtype flags_t is agar.gui.types.window_flags_t; - WINDOW_MODAL : constant flags_t := 16#00001#; - WINDOW_MAXIMIZED : constant flags_t := 16#00002#; - WINDOW_MINIMIZED : constant flags_t := 16#00004#; - WINDOW_KEEPABOVE : constant flags_t := 16#00008#; - WINDOW_KEEPBELOW : constant flags_t := 16#00010#; - WINDOW_DENYFOCUS : constant flags_t := 16#00020#; - WINDOW_NOTITLE : constant flags_t := 16#00040#; - WINDOW_NOBORDERS : constant flags_t := 16#00080#; - WINDOW_NOHRESIZE : constant flags_t := 16#00100#; - WINDOW_NOVRESIZE : constant flags_t := 16#00200#; - WINDOW_NOCLOSE : constant flags_t := 16#00400#; - WINDOW_NOMINIMIZE : constant flags_t := 16#00800#; - WINDOW_NOMAXIMIZE : constant flags_t := 16#01000#; - WINDOW_NOBACKGROUND : constant flags_t := 16#08000#; - WINDOW_NOUPDATERECT : constant flags_t := 16#10000#; - WINDOW_FOCUSONATTACH : constant flags_t := 16#20000#; - WINDOW_HMAXIMIZE : constant flags_t := 16#40000#; - WINDOW_VMAXIMIZE : constant flags_t := 16#80000#; - WINDOW_NORESIZE : constant flags_t := WINDOW_NOHRESIZE or WINDOW_NOVRESIZE; - WINDOW_PLAIN : constant flags_t := WINDOW_NOTITLE or WINDOW_NOBORDERS; + WINDOW_MODAL : constant flags_t := 16#000001#; + WINDOW_MAXIMIZED : constant flags_t := 16#000002#; + WINDOW_MINIMIZED : constant flags_t := 16#000004#; + WINDOW_KEEPABOVE : constant flags_t := 16#000008#; + WINDOW_KEEPBELOW : constant flags_t := 16#000010#; + WINDOW_DENYFOCUS : constant flags_t := 16#000020#; + WINDOW_NOTITLE : constant flags_t := 16#000040#; + WINDOW_NOBORDERS : constant flags_t := 16#000080#; + WINDOW_NOHRESIZE : constant flags_t := 16#000100#; + WINDOW_NOVRESIZE : constant flags_t := 16#000200#; + WINDOW_NOCLOSE : constant flags_t := 16#000400#; + WINDOW_NOMINIMIZE : constant flags_t := 16#000800#; + WINDOW_NOMAXIMIZE : constant flags_t := 16#001000#; + WINDOW_NOBACKGROUND : constant flags_t := 16#008000#; + WINDOW_NOUPDATERECT : constant flags_t := 16#010000#; + WINDOW_FOCUSONATTACH : constant flags_t := 16#020000#; + WINDOW_HMAXIMIZE : constant flags_t := 16#040000#; + WINDOW_VMAXIMIZE : constant flags_t := 16#080000#; + WINDOW_NOMOVE : constant flags_t := 16#100000#; + WINDOW_NOCLIPPING : constant flags_t := 16#200000#; + WINDOW_NORESIZE : constant flags_t := WINDOW_NOHRESIZE or + WINDOW_NOVRESIZE; + WINDOW_NOBUTTONS : constant flags_t := WINDOW_NOCLOSE or + WINDOW_NOMINIMIZE or + WINDOW_NOMAXIMIZE; + WINDOW_PLAIN : constant flags_t := WINDOW_NOTITLE or + WINDOW_NOBORDERS; subtype alignment_t is agar.gui.types.window_alignment_t; Modified: trunk/gui/AG_Window.3 =================================================================== --- trunk/gui/AG_Window.32008-10-06 13:56:39 UTC (rev 7784) +++ trunk/gui/AG_Window.32008-10-06 14:16:41 UTC (rev 7785) < at >< at > -233,6 +233,8 < at >< at > Keep window scaled to the display height. .It AG_WINDOW_NOMOVE User is not allowed to move the window. +.It AG_WINDOW_NOCLIPPING +Disable the clipping rectangle over the window area (enabled by default).. .El .Pp The Modified: trunk/gui/window.c =================================================================== --- trunk/gui/window.c2008-10-06 13:56:39 UTC (rev 7784) +++ trunk/gui/window.c2008-10-06 14:16:41 UTC (rev 7785) < at >< at > -230,15 +230,17 < at >< at > STYLE(win)->Window(win); hTitle = (win->tbar != NULL) ? HEIGHT(win->tbar) : 0; -AG_PushClipRect(win, - AG_RECT(0, 0, - WIDTH(win) - win->wBorderSide*2, - HEIGHT(win) - win->wBorderBot)); - -WIDGET_FOREACH_CHILD(chld, win) +if (!(win->flags & AG_WINDOW_NOCLIPPING)) { +AG_PushClipRect(win, + AG_RECT(0, 0, + WIDTH(win) - win->wBorderSide*2, + HEIGHT(win) - win->wBorderBot)); +} +WIDGET_FOREACH_CHILD(chld, win) { AG_WidgetDraw(chld); - -AG_PopClipRect(); +} +if (!(win->flags & AG_WINDOW_NOCLIPPING)) +AG_PopClipRect(); } /* Apply initial alignment parameter. */ Modified: trunk/gui/window.h =================================================================== --- trunk/gui/window.h2008-10-06 13:56:39 UTC (rev 7784) +++ trunk/gui/window.h2008-10-06 14:16:41 UTC (rev 7785) < at >< at > -68,6 +68,8 < at >< at > #define AG_WINDOW_HMAXIMIZE0x040000 /* Keep maximized horizontally */ #define AG_WINDOW_VMAXIMIZE0x080000 /* Keep maximized vertically */ #define AG_WINDOW_NOMOVE0x100000 /* Disallow movement of window */ +#define AG_WINDOW_NOCLIPPING0x200000 /* Don't set a clipping rectangle + over the window area */ #define AG_WINDOW_NORESIZE(AG_WINDOW_NOHRESIZE|AG_WINDOW_NOVRESIZE) #define AG_WINDOW_NOBUTTONS(AG_WINDOW_NOCLOSE|AG_WINDOW_NOMINIMIZE|\

Agar: r7784 - trunk/gui

Agar-SVN — 2008-10-06T13:57:05

Author: vedge Date: 2008-10-06 10:56:39 -0300 (Mon, 06 Oct 2008) New Revision: 7784 Modified: trunk/gui/AG_Widget.3 Log: document WidgetSetFocusable() Modified: trunk/gui/AG_Widget.3 =================================================================== --- trunk/gui/AG_Widget.32008-10-06 13:55:50 UTC (rev 7783) +++ trunk/gui/AG_Widget.32008-10-06 13:56:39 UTC (rev 7784) < at >< at > -236,7 +236,7 < at >< at > macros evaluate whether the given widget is enabled for input. .Sh FOCUS STATE The focus state of a widget controls both its appearance and enables the -reception of specific types of events. +reception of specific types of events which are filtered by default. A focused widget (in a currently focused window) will receive mouse events .Sq window-mousemotion , .Sq window-mousebuttonup , < at >< at > -245,15 +245,17 < at >< at > and .Sq window-keydown . .Pp -Note that any widget can still receive those events regardless of focus -state, using -.Dv AG_WIDGET_UNFOCUSED_* -flags, such as -.Dv AG_WIDGET_UNFOCUSED_MOTION +Widget can explicitely disable focus-dependent filtering for those events +by setting the flags +.Dv AG_WIDGET_UNFOCUSED_MOTION , +.Dv AG_WIDGET_UNFOCUSED_BUTTONUP and -.Dv AG_WIDGET_UNFOCUSED_BUTTONUP . +.Dv AG_WIDGET_UNFOCUSED_BUTTONDOWN . .Pp .nr nS 1 +.Ft "void" +.Fn AG_WidgetSetFocusable "AG_Widget *widget" "int enable" +.Pp .Ft "int" .Fn AG_WidgetFocused "AG_Widget *widget" .Pp < at >< at > -268,6 +270,10 < at >< at > .Pp .nr nS 0 The +.Fn AG_WidgetSetFocusable +routine sets whether the widget is allowed to gain focus (off by default). +.Pp +The .Fn AG_WidgetFocused macro evaluates to 1 if a widget holds focus inside of its parent. .Pp < at >< at > -1247,7 +1253,8 < at >< at > .Dq INPUT STATE section for more details. .It AG_WIDGET_FOCUSABLE -The widget can grab the focus. +Widget allowed to grab the focus (set by +.Fn AG_WidgetSetFocusable ) . .It AG_WIDGET_UNFOCUSED_MOTION Receive .Sq window-mousemotion

Agar: r7783 - trunk/gui

Agar-SVN — 2008-10-06T13:56:16

Author: vedge Date: 2008-10-06 10:55:50 -0300 (Mon, 06 Oct 2008) New Revision: 7783 Modified: trunk/gui/view.h Log: fix geometry returned by RectIntersect() Modified: trunk/gui/view.h =================================================================== --- trunk/gui/view.h2008-10-06 13:51:44 UTC (rev 7782) +++ trunk/gui/view.h2008-10-06 13:55:50 UTC (rev 7783) < at >< at > -483,10 +483,10 < at >< at > { AG_Rect x; -x.x = (a->x > b->x) ? a->x : b->x; -x.y = (a->y > b->y) ? a->y : b->y; -x.w = (a->w < b->w) ? a->w : b->w; -x.h = (a->h < b->h) ? a->h : b->h; +x.x = AG_MAX(a->x, b->x); +x.y = AG_MAX(a->y, b->y); +x.w = AG_MIN((a->x+a->w), (b->x+b->w)) - x.x; +x.h = AG_MIN((a->y+a->h), (b->y+b->h)) - x.y; return (x); } static __inline__ SDL_Rect

Agar: r7781 - trunk/gui

Agar-SVN — 2008-10-06T13:04:47

Author: vedge Date: 2008-10-06 10:04:21 -0300 (Mon, 06 Oct 2008) New Revision: 7781 Modified: trunk/gui/AG_Scrollview.3 trunk/gui/scrollview.c trunk/gui/scrollview.h Log: - adjust offset if needed on resize. - make SCROLLVIEW_PAN_XY the default. - fix scrollbar "visible" binding. Modified: trunk/gui/AG_Scrollview.3 =================================================================== --- trunk/gui/AG_Scrollview.32008-10-06 13:00:53 UTC (rev 7780) +++ trunk/gui/AG_Scrollview.32008-10-06 13:04:21 UTC (rev 7781) < at >< at > -66,15 +66,15 < at >< at > may include: .Pp .Bl -tag -width "AG_SCROLLVIEW_BY_CURSOR " -.It Dv AG_SCROLLVIEW_PAN_X -The X is pannable. -.It Dv AG_SCROLLVIEW_PAN_Y -The Y is pannable. -.It Dv AG_SCROLLVIEW_PAN_XY +.It Dv AG_SCROLLVIEW_NOPAN_X +Disable panning over X. +.It Dv AG_SCROLLVIEW_NOPAN_Y +Disable panning over Y. +.It Dv AG_SCROLLVIEW_NOPAN_XY Alias for -.Dv AG_SCROLLVIEW_PAN_X +.Dv AG_SCROLLVIEW_NOPAN_X and -.Dv AG_SCROLLVIEW_PAN_Y . +.Dv AG_SCROLLVIEW_NOPAN_Y . .It Dv AG_SCROLLVIEW_BY_CURSOR Panning with cursor is permitted (may interfere with the operation of child widgets). Modified: trunk/gui/scrollview.c =================================================================== --- trunk/gui/scrollview.c2008-10-06 13:00:53 UTC (rev 7780) +++ trunk/gui/scrollview.c2008-10-06 13:04:21 UTC (rev 7781) < at >< at > -39,10 +39,8 < at >< at > { AG_Widget *chld; -if (xRel+wid->x+wid->w < 0 || - yRel+wid->y+wid->h < 0 || - xRel+wid->x > WIDTH(sv) || - yRel+wid->y > HEIGHT(sv)) { +if (wid->x+wid->w < 0 || + wid->y+wid->h < 0) { wid->flags |= AG_WIDGET_HIDE; } else { wid->flags &= ~(AG_WIDGET_HIDE); < at >< at > -80,8 +78,20 < at >< at > } ClipWidgets(sv, chld, 0,0); } -if (wTot != NULL) { *wTot = aChld.x+aChld.w; } -if (hTot != NULL) { *hTot = aChld.y+aChld.h; } +switch (sv->pack) { +case AG_PACK_HORIZ: +if (wTot != NULL) +*wTot = aChld.x + sv->xOffs; +if (hTot != NULL) +*hTot = aChld.y+aChld.h + sv->yOffs; +break; +case AG_PACK_VERT: +if (wTot != NULL) +*wTot = aChld.x+aChld.w + sv->xOffs; +if (hTot != NULL) +*hTot = aChld.y + sv->yOffs; +break; +} } static void < at >< at > -176,20 +186,20 < at >< at > if (flags & AG_SCROLLVIEW_HFILL) { AG_ExpandHoriz(sv); } if (flags & AG_SCROLLVIEW_VFILL) { AG_ExpandVert(sv); } -if (flags & AG_SCROLLVIEW_PAN_X) { +if (!(flags & AG_SCROLLVIEW_NOPAN_X)) { sv->hbar = AG_ScrollbarNew(sv, AG_SCROLLBAR_HORIZ, 0); AG_WidgetBindInt(sv->hbar, "value", &sv->xOffs); AG_WidgetBindInt(sv->hbar, "min", &sv->xMin); AG_WidgetBindInt(sv->hbar, "max", &sv->xMax); -AG_WidgetBindInt(sv->hbar, "visible", &WIDGET(sv)->w); +AG_WidgetBindInt(sv->hbar, "visible", &sv->rView.w); AG_SetEvent(sv->hbar, "scrollbar-changed", Scrolled, "%p", sv); } -if (flags & AG_SCROLLVIEW_PAN_Y) { +if (!(flags & AG_SCROLLVIEW_NOPAN_Y)) { sv->vbar = AG_ScrollbarNew(sv, AG_SCROLLBAR_VERT, 0); AG_WidgetBindInt(sv->vbar, "value", &sv->yOffs); AG_WidgetBindInt(sv->vbar, "min", &sv->yMin); AG_WidgetBindInt(sv->vbar, "max", &sv->yMax); -AG_WidgetBindInt(sv->vbar, "visible", &WIDGET(sv)->h); +AG_WidgetBindInt(sv->vbar, "visible", &sv->rView.h); AG_SetEvent(sv->vbar, "scrollbar-changed", Scrolled, "%p", sv); } < at >< at > -224,6 +234,7 < at >< at > sv->hbar = NULL; sv->vbar = NULL; sv->pack = AG_PACK_VERT; +sv->rView = AG_RECT(0,0,0,0); } void < at >< at > -282,28 +293,44 < at >< at > AG_SizeReq rBar; AG_SizeAlloc aBar; int wTot, hTot; - + +sv->rView.w = a->w; +sv->rView.h = a->h; + if (sv->hbar != NULL) { AG_WidgetSizeReq(sv->hbar, &rBar); -aBar.w = a->w; +aBar.w = a->w - rBar.h; aBar.h = rBar.h; aBar.x = 0; aBar.y = a->h - rBar.h; AG_WidgetSizeAlloc(sv->hbar, &aBar); +sv->rView.h -= aBar.h; +if (sv->rView.h < 0) { sv->rView.h = 0; } } if (sv->vbar != NULL) { AG_WidgetSizeReq(sv->vbar, &rBar); aBar.w = rBar.w; -aBar.h = a->h; +aBar.h = a->h - rBar.w; aBar.x = a->w - rBar.w; aBar.y = 0; AG_WidgetSizeAlloc(sv->vbar, &aBar); +sv->rView.w -= aBar.w; +if (sv->rView.w < 0) { sv->rView.w = 0; } } PlaceWidgets(sv, &wTot, &hTot); -if (sv->hbar != NULL) { sv->xMax = wTot; } -if (sv->vbar != NULL) { sv->yMax = hTot; } +sv->xMax = wTot; +sv->yMax = hTot; +if (sv->hbar != NULL) { +if ((sv->xMax - sv->rView.w - sv->xOffs) < 0) +sv->xOffs = MAX(0, sv->xMax - sv->rView.w); +} +if (sv->vbar != NULL) { +if ((sv->yMax - sv->rView.h - sv->yOffs) < 0) +sv->yOffs = MAX(0, sv->yMax - sv->rView.h); +} +#if 0 if (a->w >= (wTot - sv->xOffs)) { sv->xOffs = wTot - a->w; if (sv->xOffs < 0) { sv->xOffs = 0; } < at >< at > -312,6 +339,7 < at >< at > sv->yOffs = hTot - a->h; if (sv->yOffs < 0) { sv->yOffs = 0; } } +#endif return (0); } < at >< at > -320,20 +348,15 < at >< at > { AG_Scrollview *sv = p; AG_Widget *chld; -AG_Rect rView; AG_DrawBox(sv, AG_RECT(0, 0, WIDTH(sv), HEIGHT(sv)), -1, AG_COLOR(FRAME_COLOR)); -rView = AG_RECT(0, 0, WIDTH(sv), HEIGHT(sv)); -if (sv->hbar != NULL) { rView.h -= HEIGHT(sv->hbar); } -if (sv->vbar != NULL) { rView.w -= WIDTH(sv->vbar); } - if (sv->hbar != NULL) { AG_WidgetDraw(sv->hbar); } if (sv->vbar != NULL) { AG_WidgetDraw(sv->vbar); } -AG_PushClipRect(sv, rView); +AG_PushClipRect(sv, sv->rView); WIDGET_FOREACH_CHILD(chld, sv) { if (chld == WIDGET(sv->hbar) || chld == WIDGET(sv->vbar)) { continue; Modified: trunk/gui/scrollview.h =================================================================== --- trunk/gui/scrollview.h2008-10-06 13:00:53 UTC (rev 7780) +++ trunk/gui/scrollview.h2008-10-06 13:04:21 UTC (rev 7781) < at >< at > -14,18 +14,19 < at >< at > Uint flags; #define AG_SCROLLVIEW_HFILL0x01 #define AG_SCROLLVIEW_VFILL0x02 -#define AG_SCROLLVIEW_PAN_X0x04 /* X is pannable */ -#define AG_SCROLLVIEW_PAN_Y0x08 /* Y is pannable */ +#define AG_SCROLLVIEW_NOPAN_X0x04 /* X is not pannable */ +#define AG_SCROLLVIEW_NOPAN_Y0x08 /* Y is not pannable */ #define AG_SCROLLVIEW_PANNING0x10 /* Panning in progress */ #define AG_SCROLLVIEW_BY_CURSOR0x20 /* Panning with cursor allowed */ #define AG_SCROLLVIEW_BY_KBD0x40 /* Panning with keyboard allowed */ #define AG_SCROLLVIEW_EXPAND(AG_SCROLLVIEW_HFILL|AG_SCROLLVIEW_VFILL) -#define AG_SCROLLVIEW_PAN_XY(AG_SCROLLVIEW_PAN_X|AG_SCROLLVIEW_PAN_Y) +#define AG_SCROLLVIEW_NOPAN_XY(AG_SCROLLVIEW_NOPAN_X|AG_SCROLLVIEW_NOPAN_Y) enum ag_widget_packing pack;/* Packing mode */ int wPre, hPre;/* Requested geometry */ int xOffs, yOffs;/* Display offset */ int xMin, xMax, yMin, yMax;/* Display boundaries */ +AG_Rect rView;/* Available space for widgets */ AG_Scrollbar *hbar, *vbar;/* Scrollbars for panning */ } AG_Scrollview;

Agar: r7778 - trunk/gui

Agar-SVN — 2008-10-05T15:46:35

Author: vedge Date: 2008-10-05 12:46:13 -0300 (Sun, 05 Oct 2008) New Revision: 7778 Modified: trunk/gui/window.c Log: push clipping rectangle over window area for now. Modified: trunk/gui/window.c =================================================================== --- trunk/gui/window.c2008-10-05 15:45:03 UTC (rev 7777) +++ trunk/gui/window.c2008-10-05 15:46:13 UTC (rev 7778) < at >< at > -225,10 +225,20 < at >< at > { AG_Window *win = obj; AG_Widget *chld; +int hTitle = 0; + +STYLE(win)->Window(win); -STYLE(win)->Window(win); +hTitle = (win->tbar != NULL) ? HEIGHT(win->tbar) : 0; +AG_PushClipRect(win, + AG_RECT(0, 0, + WIDTH(win) - win->wBorderSide*2, + HEIGHT(win) - win->wBorderBot)); + WIDGET_FOREACH_CHILD(chld, win) AG_WidgetDraw(chld); + +AG_PopClipRect(); } /* Apply initial alignment parameter. */ < at >< at > -1159,11 +1169,6 < at >< at > return (-1); } -static __inline__ void -UpdateMinSize(AG_Window *win) -{ -} - /* Configure minimum window size in percentage of computed geometry. */ void AG_WindowSetMinSizePct(AG_Window *win, int pct) < at >< at > -1171,7 +1176,6 < at >< at > AG_ObjectLock(win); win->flags |= AG_WINDOW_MINSIZEPCT; win->minPct = pct; -UpdateMinSize(win); AG_ObjectUnlock(win); } < at >< at > -1183,7 +1187,6 < at >< at > win->flags &= ~(AG_WINDOW_MINSIZEPCT); win->wMin = w; win->hMin = h; -UpdateMinSize(win); AG_ObjectUnlock(win); } < at >< at > -1506,7 +1509,6 < at >< at > win->wReq = r->w; win->hReq = r->h; -UpdateMinSize(win); ClampToView(win); }

Agar: r7777 - trunk/gui

Agar-SVN — 2008-10-05T15:45:24

Author: vedge Date: 2008-10-05 12:45:03 -0300 (Sun, 05 Oct 2008) New Revision: 7777 Modified: trunk/gui/label.c Log: advance pointer in %l* case Modified: trunk/gui/label.c =================================================================== --- trunk/gui/label.c2008-10-05 15:44:07 UTC (rev 7776) +++ trunk/gui/label.c2008-10-05 15:45:03 UTC (rev 7777) < at >< at > -558,9 +558,11 < at >< at > switch (f[2]) { case 'f': PF("%.2f", AG_LABEL_ARG(lbl,double)); +f += 2; break; case 'g': PF("%g", AG_LABEL_ARG(lbl,double)); +f += 2; break; #ifdef HAVE_64BIT case 'l':

Agar: r7776 - trunk/gui

Agar-SVN — 2008-10-05T15:44:28

Author: vedge Date: 2008-10-05 12:44:07 -0300 (Sun, 05 Oct 2008) New Revision: 7776 Modified: trunk/gui/tlist.c Log: nicer undersize behavior for scrollbar. Modified: trunk/gui/tlist.c =================================================================== --- trunk/gui/tlist.c2008-10-05 15:12:48 UTC (rev 7775) +++ trunk/gui/tlist.c2008-10-05 15:44:07 UTC (rev 7776) < at >< at > -231,7 +231,6 < at >< at > tl->dblclicked = NULL; tl->nitems = 0; tl->nvisitems = 0; -tl->sbar = AG_ScrollbarNew(tl, AG_SCROLLBAR_VERT, 0); tl->compare_fn = AG_TlistComparePtrs; tl->wHint = 0; tl->hHint = tl->item_h + 2; < at >< at > -242,6 +241,9 < at >< at > TAILQ_INIT(&tl->items); TAILQ_INIT(&tl->selitems); TAILQ_INIT(&tl->popups); + +tl->sbar = AG_ScrollbarNew(tl, AG_SCROLLBAR_VERT, 0); +AG_WidgetSetFocusable(tl->sbar, 0); AG_SetEvent(tl->sbar, "scrollbar-changed", ScrollbarChanged, "%p", tl); AG_SetEvent(tl, "window-mousebuttondown", MouseButtonDown, NULL); < at >< at > -340,8 +342,8 < at >< at > AG_SizeAlloc aBar; AG_WidgetSizeReq(tl->sbar, &rBar); -if (rBar.w > a->w) { -return (-1); +if (a->w < rBar.w*2) { +rBar.w = MAX(0, a->w/2); } aBar.w = rBar.w; aBar.h = a->h; < at >< at > -350,14 +352,7 < at >< at > AG_WidgetSizeAlloc(tl->sbar, &aBar); tl->wRow = a->w - aBar.w; -if (a->w < rBar.w || a->h < tl->sbar->wButton*2) { -WIDGET(tl->sbar)->flags |= AG_WIDGET_HIDE; -} else { -WIDGET(tl->sbar)->flags &= ~(AG_WIDGET_HIDE); -} UpdateListScrollbar(tl); - -AG_WidgetEnableClipping(tl, AG_RECT(0,0,a->w,a->h)); return (0); } < at >< at > -369,14 +364,11 < at >< at > int y = 0, i = 0, selSeen = 0, selPos = 1; int offset; -STYLE(tl)->ListBackground(tl, - AG_RECT(0, - 0, - tl->wRow, - HEIGHT(tl))); - +STYLE(tl)->ListBackground(tl, AG_RECT(0, 0, tl->wRow, HEIGHT(tl))); AG_WidgetDraw(tl->sbar); +AG_PushClipRect(tl, AG_RECT(0, 0, tl->wRow, HEIGHT(tl))); + if (tl->flags & AG_TLIST_POLL) { AG_PostEvent(NULL, tl, "tlist-poll", NULL); } < at >< at > -452,6 +444,7 < at >< at > } else { tl->flags &= ~(AG_TLIST_SCROLLTOSEL); } +AG_PopClipRect(); } /*

Agar: r7775 - trunk/demos/loader

Agar-SVN — 2008-10-05T15:13:09

Author: vedge Date: 2008-10-05 12:12:48 -0300 (Sun, 05 Oct 2008) New Revision: 7775 Modified: trunk/demos/loader/loader.c Log: attach the Pixmaps to a Scrollview. Modified: trunk/demos/loader/loader.c =================================================================== --- trunk/demos/loader/loader.c2008-10-05 15:12:17 UTC (rev 7774) +++ trunk/demos/loader/loader.c2008-10-05 15:12:48 UTC (rev 7775) < at >< at > -28,6 +28,7 < at >< at > AG_FileType *ft = AG_PTR(2); AG_Surface *bmp; AG_Window *win; +AG_Scrollview *sv; Uint8 *pSrc; char *title; int i; < at >< at > -63,15 +64,18 < at >< at > } /* - * Add a pixmap widget displaying the bitmap, scaled down to the - * maximum view size if needed. + * Place an AG_Pixmap(3) widget inside of an AG_Scrollview(3) to + * display the image. */ -AG_PixmapFromSurfaceScaled(win, 0, bmp, - (bmp->w < (agView->w - 16)) ? bmp->w : agView->w - 16, - (bmp->h < (agView->h - 40)) ? bmp->h : agView->h - 40); +sv = AG_ScrollviewNew(win, AG_SCROLLVIEW_EXPAND); +AG_PixmapFromSurfaceScaled(sv, 0, bmp, bmp->w, bmp->h); +AG_WindowSetGeometryAligned(win, AG_WINDOW_MC, + AG_MIN(agView->w,bmp->w), + AG_MIN(agView->h,bmp->h)); +AG_WindowShow(win); + AG_SurfaceFree(bmp); -AG_WindowShow(win); } #ifdef HAVE_SDL_IMAGE < at >< at > -84,8 +88,8 < at >< at > char *file = AG_STRING(1); AG_FileType *ft = AG_PTR(2); SDL_Surface *img; -AG_Surface *aImg; AG_Window *win; +AG_Scrollview *sv; char *title; int i; < at >< at > -102,16 +106,20 < at >< at > } win = AG_WindowNew(0); AG_WindowSetCaption(win, "Image <%s>", title); + /* - * Add a pixmap widget displaying the bitmap, scaled down to the - * maximum view size if needed. + * Place an AG_Pixmap(3) widget inside of an AG_Scrollview(3) to + * display the image. */ -aImg = AG_SurfaceFromSDL(img); -AG_PixmapFromSurfaceScaled(win, 0, aImg, - (img->w < (agView->w - 16)) ? img->w : agView->w - 16, - (img->h < (agView->h - 40)) ? img->h : agView->h - 40); +sv = AG_ScrollviewNew(win, AG_SCROLLVIEW_EXPAND); +AG_PixmapFromSurface(sv, 0, AG_SurfaceFromSDL(img)); + +AG_WindowSetGeometryAligned(win, AG_WINDOW_MC, + AG_MIN(agView->w,img->w), + AG_MIN(agView->h,img->h)); +AG_WindowShow(win); + SDL_FreeSurface(img); -AG_WindowShow(win); } #endif /* HAVE_SDL_IMAGE */

Agar: r7774 - trunk/demos/plotting

Agar-SVN — 2008-10-05T15:12:38

Author: vedge Date: 2008-10-05 12:12:17 -0300 (Sun, 05 Oct 2008) New Revision: 7774 Modified: trunk/demos/plotting/plotting.c Log: use %Lf in LabelPolledNew() Modified: trunk/demos/plotting/plotting.c =================================================================== --- trunk/demos/plotting/plotting.c2008-10-05 15:11:10 UTC (rev 7773) +++ trunk/demos/plotting/plotting.c2008-10-05 15:12:17 UTC (rev 7774) < at >< at > -276,13 +276,13 < at >< at > } AG_SeparatorNewHoriz(box); -AG_LabelNewPolled(box, 0, "Aref: %F", &Aref); -AG_LabelNewPolled(box, 0, "v1: %F", &v1); -AG_LabelNewPolled(box, 0, "v2: %F", &v2); -AG_LabelNewPolled(box, 0, "v3: %F", &v3); -AG_LabelNewPolled(box, 0, "Ts: %F", &Ts); -AG_LabelNewPolled(box, 0, "Ta: %F", &Ta); -AG_LabelNewPolled(box, 0, "To: %F", &To); +AG_LabelNewPolled(box, 0, "Aref: %lf", &Aref); +AG_LabelNewPolled(box, 0, "v1: %lf", &v1); +AG_LabelNewPolled(box, 0, "v2: %lf", &v2); +AG_LabelNewPolled(box, 0, "v3: %lf", &v3); +AG_LabelNewPolled(box, 0, "Ts: %lf", &Ts); +AG_LabelNewPolled(box, 0, "Ta: %lf", &Ta); +AG_LabelNewPolled(box, 0, "To: %lf", &To); AG_ButtonAct(box, AG_BUTTON_HFILL, "Generate", GeneratePlot, "%p", plt); }

Agar: r7773 - trunk/demos/scrollbar

Agar-SVN — 2008-10-05T15:11:32

Author: vedge Date: 2008-10-05 12:11:10 -0300 (Sun, 05 Oct 2008) New Revision: 7773 Modified: trunk/demos/scrollbar/scrollbar.c Log: double is %lf in LabelNewPolled() Modified: trunk/demos/scrollbar/scrollbar.c =================================================================== --- trunk/demos/scrollbar/scrollbar.c2008-10-05 15:08:41 UTC (rev 7772) +++ trunk/demos/scrollbar/scrollbar.c2008-10-05 15:11:10 UTC (rev 7773) < at >< at > -13,7 +13,7 < at >< at > #include int vInt = 50000, minInt = -100000, maxInt = 100000, visInt = 0; -unsigned vUint = 20, minUint = 10, maxUint = 100, visUint = 0; +unsigned vUint = 0, minUint = -5, maxUint = 5, visUint = 0; Sint8 v8 = 100, min8 = -100, max8 = 100, vis8 = 0; Uint32 v32 = 1234, min32 = 1, max32 = 1000000, vis32 = 0; float vFlt = 1.0, minFlt = 0.0, maxFlt = 10.0, visFlt = 0.0; < at >< at > -46,7 +46,7 < at >< at > AG_ScrollbarNewFloat(win, AG_SCROLLBAR_HORIZ, AG_SCROLLBAR_HFILL, &vFlt, &minFlt, &maxFlt, &visFlt); -AG_LabelNewPolled(win, AG_LABEL_HFILL, "Double binding: %F", &vDbl); +AG_LabelNewPolled(win, AG_LABEL_HFILL, "Double binding: %lf", &vDbl); AG_ScrollbarNewDouble(win, AG_SCROLLBAR_HORIZ, AG_SCROLLBAR_HFILL, &vDbl, &minDbl, &maxDbl, &visDbl);