add timitidy.., Xaw3d, sdl-mixer
This commit is contained in:
@@ -0,0 +1,26 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file http://www.gnu.org/licenses/gpl.txt
|
||||
|
||||
from pisi.actionsapi import get
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
|
||||
def setup():
|
||||
autotools.autoreconf("-vif")
|
||||
autotools.configure("--prefix=/usr \
|
||||
--disable-static \
|
||||
--enable-arrow-scrollbars \
|
||||
--enable-gray-stipples \
|
||||
--enable-multiplane-bitmaps")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s install" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("ChangeLog","COPYING","README","src/README.XAW3D")
|
||||
@@ -0,0 +1,162 @@
|
||||
diff -up libXaw3d-1.6.1/src/Label.c.3Dlabel libXaw3d-1.6.1/src/Label.c
|
||||
--- libXaw3d-1.6.1/src/Label.c.3Dlabel 2011-09-19 15:42:36.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/Label.c 2012-02-25 14:44:33.766774776 -0700
|
||||
@@ -416,9 +416,16 @@ GetgrayGC(LabelWidget lw)
|
||||
static void
|
||||
compute_bitmap_offsets (LabelWidget lw)
|
||||
{
|
||||
- if (lw->label.lbm_height != 0)
|
||||
- lw->label.lbm_y = (lw->core.height - lw->label.lbm_height) / 2;
|
||||
- else
|
||||
+ /*
|
||||
+ * bitmap will be eventually be displayed at
|
||||
+ * (internal_width, internal_height + lbm_y)
|
||||
+ */
|
||||
+ if (lw->label.lbm_height != 0) {
|
||||
+ lw->label.lbm_y = (lw->core.height -
|
||||
+ (lw->threeD.shadow_width * 2 +
|
||||
+ lw->label.internal_height * 2 +
|
||||
+ lw->label.lbm_height)) / 2;
|
||||
+ } else
|
||||
lw->label.lbm_y = 0;
|
||||
}
|
||||
|
||||
@@ -444,9 +451,11 @@ Initialize(Widget request, Widget new, A
|
||||
{
|
||||
LabelWidget lw = (LabelWidget) new;
|
||||
|
||||
+#if 0
|
||||
/* disable shadows if we're not a subclass of Command */
|
||||
if (!XtIsSubclass(new, commandWidgetClass))
|
||||
lw->threeD.shadow_width = 0;
|
||||
+#endif
|
||||
|
||||
if (lw->label.label == NULL)
|
||||
lw->label.label = XtNewString(lw->core.name);
|
||||
@@ -460,18 +469,20 @@ Initialize(Widget request, Widget new, A
|
||||
|
||||
if (lw->core.height == 0)
|
||||
lw->core.height = lw->label.label_height +
|
||||
- 2 * lw->label.internal_height;
|
||||
+ 2 * lw->label.internal_height +
|
||||
+ 2 * lw->threeD.shadow_width;
|
||||
|
||||
set_bitmap_info(lw); /* req's core.height, sets label.lbm_* */
|
||||
|
||||
if (lw->label.lbm_height > lw->label.label_height)
|
||||
lw->core.height = lw->label.lbm_height +
|
||||
- 2 * lw->label.internal_height;
|
||||
+ 2 * lw->label.internal_height;
|
||||
|
||||
if (lw->core.width == 0)
|
||||
lw->core.width = lw->label.label_width +
|
||||
- 2 * lw->label.internal_width +
|
||||
- LEFT_OFFSET(lw); /* req's label.lbm_width */
|
||||
+ 2 * lw->label.internal_width +
|
||||
+ 2 * lw->threeD.shadow_width +
|
||||
+ LEFT_OFFSET(lw); /* req's label.lbm_width */
|
||||
|
||||
lw->label.label_x = lw->label.label_y = 0;
|
||||
(*XtClass(new)->core_class.resize) ((Widget)lw);
|
||||
@@ -549,14 +560,16 @@ Redisplay(Widget gw, XEvent *event, Regi
|
||||
if (w->label.depth == 1)
|
||||
XCopyPlane(XtDisplay(gw), pm, XtWindow(gw), gc, 0, 0,
|
||||
w->label.lbm_width, w->label.lbm_height,
|
||||
- (int) w->label.internal_width,
|
||||
- (int) w->label.lbm_y,
|
||||
+ (int) w->label.internal_width + w->threeD.shadow_width,
|
||||
+ (int) w->label.internal_height + w->threeD.shadow_width
|
||||
+ + w->label.lbm_y,
|
||||
(unsigned long) 1L);
|
||||
else
|
||||
XCopyArea(XtDisplay(gw), pm, XtWindow(gw), gc, 0, 0,
|
||||
w->label.lbm_width, w->label.lbm_height,
|
||||
- (int) w->label.internal_width,
|
||||
- (int) w->label.lbm_y);
|
||||
+ (int) w->label.internal_width + w->threeD.shadow_width,
|
||||
+ (int) w->label.internal_height + w->threeD.shadow_width
|
||||
+ + w->label.lbm_y);
|
||||
}
|
||||
|
||||
#ifdef XAW_INTERNATIONALIZATION
|
||||
@@ -646,14 +659,17 @@ _Reposition(LabelWidget lw, Dimension wi
|
||||
Position *dx, Position *dy)
|
||||
{
|
||||
Position newPos;
|
||||
- Position leftedge = lw->label.internal_width + LEFT_OFFSET(lw);
|
||||
+ Position leftedge = lw->label.internal_width + LEFT_OFFSET(lw) +
|
||||
+ lw->threeD.shadow_width;
|
||||
+
|
||||
|
||||
switch (lw->label.justify) {
|
||||
case XtJustifyLeft:
|
||||
newPos = leftedge;
|
||||
break;
|
||||
case XtJustifyRight:
|
||||
- newPos = width - lw->label.label_width - lw->label.internal_width;
|
||||
+ newPos = width - (lw->label.label_width + lw->label.internal_width +
|
||||
+ lw->threeD.shadow_width);
|
||||
break;
|
||||
case XtJustifyCenter:
|
||||
default:
|
||||
@@ -745,17 +761,20 @@ SetValues(Widget current, Widget request
|
||||
if (newlw->label.resize && was_resized) {
|
||||
if (curlw->core.height == reqlw->core.height && !checks[HEIGHT])
|
||||
newlw->core.height = newlw->label.label_height +
|
||||
- 2 * newlw->label.internal_height;
|
||||
+ 2 * newlw->label.internal_height +
|
||||
+ 2 * newlw->threeD.shadow_width;
|
||||
|
||||
set_bitmap_info (newlw); /* req's core.height, sets label.lbm_* */
|
||||
|
||||
if (newlw->label.lbm_height > newlw->label.label_height)
|
||||
newlw->core.height = newlw->label.lbm_height +
|
||||
- 2 * newlw->label.internal_height;
|
||||
+ 2 * newlw->label.internal_height +
|
||||
+ 2 * newlw->threeD.shadow_width;
|
||||
|
||||
if (curlw->core.width == reqlw->core.width && !checks[WIDTH])
|
||||
newlw->core.width = newlw->label.label_width +
|
||||
2 * newlw->label.internal_width +
|
||||
+ 2 * newlw->threeD.shadow_width +
|
||||
LEFT_OFFSET(newlw); /* req's label.lbm_width */
|
||||
}
|
||||
|
||||
@@ -764,15 +783,20 @@ SetValues(Widget current, Widget request
|
||||
if (checks[HEIGHT]) {
|
||||
if (newlw->label.label_height > newlw->label.lbm_height)
|
||||
i = newlw->label.label_height +
|
||||
- 2 * newlw->label.internal_height;
|
||||
+ 2 * newlw->label.internal_height +
|
||||
+ 2 * newlw->threeD.shadow_width;
|
||||
else
|
||||
- i = newlw->label.lbm_height + 2 * newlw->label.internal_height;
|
||||
+ i = newlw->label.lbm_height +
|
||||
+ 2 * newlw->label.internal_height +
|
||||
+ 2 * newlw->threeD.shadow_width;
|
||||
if (i > newlw->core.height)
|
||||
newlw->core.height = i;
|
||||
}
|
||||
if (checks[WIDTH]) {
|
||||
- i = newlw->label.label_width + 2 * newlw->label.internal_width +
|
||||
- LEFT_OFFSET(newlw); /* req's label.lbm_width */
|
||||
+ i = newlw->label.label_width +
|
||||
+ 2 * newlw->label.internal_width +
|
||||
+ 2 * newlw->threeD.shadow_width +
|
||||
+ LEFT_OFFSET(newlw); /* req's label.lbm_width */
|
||||
if (i > newlw->core.width)
|
||||
newlw->core.width = i;
|
||||
}
|
||||
@@ -843,9 +867,11 @@ QueryGeometry(Widget w, XtWidgetGeometry
|
||||
preferred->request_mode = CWWidth | CWHeight;
|
||||
preferred->width = (lw->label.label_width +
|
||||
2 * lw->label.internal_width +
|
||||
+ 2 * lw->threeD.shadow_width +
|
||||
LEFT_OFFSET(lw));
|
||||
preferred->height = lw->label.label_height +
|
||||
- 2 * lw->label.internal_height;
|
||||
+ 2 * lw->label.internal_height +
|
||||
+ 2 * lw->threeD.shadow_width;
|
||||
if ( ((intended->request_mode & (CWWidth | CWHeight))
|
||||
== (CWWidth | CWHeight)) &&
|
||||
intended->width == preferred->width &&
|
||||
@@ -0,0 +1,60 @@
|
||||
diff -up libXaw3d-1.6.1/src/AsciiSink.c.fontset libXaw3d-1.6.1/src/AsciiSink.c
|
||||
--- libXaw3d-1.6.1/src/AsciiSink.c.fontset 2012-02-01 12:24:00.000000000 -0700
|
||||
+++ libXaw3d-1.6.1/src/AsciiSink.c 2012-02-25 14:52:46.802779081 -0700
|
||||
@@ -513,6 +513,8 @@ Initialize(Widget request, Widget new, A
|
||||
{
|
||||
AsciiSinkObject sink = (AsciiSinkObject) new;
|
||||
|
||||
+ if (!sink->ascii_sink.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
GetGC(sink);
|
||||
|
||||
sink->ascii_sink.insertCursorOn= CreateInsertCursor(XtScreenOfObject(new));
|
||||
diff -up libXaw3d-1.6.1/src/Command.c.fontset libXaw3d-1.6.1/src/Command.c
|
||||
--- libXaw3d-1.6.1/src/Command.c.fontset 2011-09-19 15:42:36.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/Command.c 2012-02-25 14:51:26.075372823 -0700
|
||||
@@ -218,6 +218,8 @@ Initialize(Widget request, Widget new, A
|
||||
CommandWidget cbw = (CommandWidget) new;
|
||||
int shape_event_base, shape_error_base;
|
||||
|
||||
+ if (!cbw->label.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
if (cbw->command.shape_style != XawShapeRectangle
|
||||
&& !XShapeQueryExtension(XtDisplay(new), &shape_event_base,
|
||||
&shape_error_base))
|
||||
diff -up libXaw3d-1.6.1/src/List.c.fontset libXaw3d-1.6.1/src/List.c
|
||||
--- libXaw3d-1.6.1/src/List.c.fontset 2011-10-09 12:01:20.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/List.c 2012-02-25 14:53:16.327465260 -0700
|
||||
@@ -362,6 +362,8 @@ Initialize(Widget junk, Widget new, ArgL
|
||||
{
|
||||
ListWidget lw = (ListWidget) new;
|
||||
|
||||
+ if (!lw->list.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
/*
|
||||
* Initialize all private resources.
|
||||
*/
|
||||
diff -up libXaw3d-1.6.1/src/SmeBSB.c.fontset libXaw3d-1.6.1/src/SmeBSB.c
|
||||
--- libXaw3d-1.6.1/src/SmeBSB.c.fontset 2011-09-19 15:42:36.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/SmeBSB.c 2012-02-25 14:50:19.056358107 -0700
|
||||
@@ -207,6 +207,8 @@ Initialize(Widget request, Widget new, A
|
||||
else
|
||||
entry->sme_bsb.label = XtNewString( entry->sme_bsb.label );
|
||||
|
||||
+ if (!entry->sme_bsb.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
CreateGCs(new);
|
||||
|
||||
GetBitmapInfo(new, TRUE); /* Left Bitmap Info */
|
||||
diff -up libXaw3d-1.6.1/src/Tip.c.fontset libXaw3d-1.6.1/src/Tip.c
|
||||
--- libXaw3d-1.6.1/src/Tip.c.fontset 2012-02-15 12:10:38.000000000 -0700
|
||||
+++ libXaw3d-1.6.1/src/Tip.c 2012-02-25 14:50:19.058358017 -0700
|
||||
@@ -248,6 +248,8 @@ XawTipInitialize(Widget req, Widget w, A
|
||||
TipWidget tip = (TipWidget)w;
|
||||
XGCValues values;
|
||||
|
||||
+ if (!tip->tip.font) XtError("Aborting: no font found\n");
|
||||
+
|
||||
tip->tip.timer = 0;
|
||||
|
||||
values.foreground = tip->tip.foreground;
|
||||
@@ -0,0 +1,260 @@
|
||||
diff -up libXaw3d-1.6.1/src/Text.c.hsbar libXaw3d-1.6.1/src/Text.c
|
||||
--- libXaw3d-1.6.1/src/Text.c.hsbar 2011-10-06 13:17:19.000000000 -0600
|
||||
+++ libXaw3d-1.6.1/src/Text.c 2012-02-25 14:54:41.996656624 -0700
|
||||
@@ -495,8 +495,10 @@ CreateHScrollBar(TextWidget ctx)
|
||||
(XtPointer) NULL);
|
||||
|
||||
/**/
|
||||
- ctx->text.r_margin.bottom += hbar->core.height + hbar->core.border_width;
|
||||
- ctx->text.margin.bottom = ctx->text.r_margin.bottom;
|
||||
+ if (ctx->text.scroll_vert == XawtextScrollAlways) {
|
||||
+ ctx->text.r_margin.bottom += hbar->core.height + hbar->core.border_width;
|
||||
+ ctx->text.margin.bottom = ctx->text.r_margin.bottom;
|
||||
+ }
|
||||
/**/
|
||||
PositionHScrollBar(ctx);
|
||||
if (XtIsRealized((Widget)ctx)) {
|
||||
@@ -519,8 +521,10 @@ DestroyHScrollBar(TextWidget ctx)
|
||||
if (hbar == NULL) return;
|
||||
|
||||
/**/
|
||||
- ctx->text.r_margin.bottom -= hbar->core.height + hbar->core.border_width;
|
||||
- ctx->text.margin.bottom = ctx->text.r_margin.bottom;
|
||||
+ if (ctx->text.scroll_vert == XawtextScrollAlways) {
|
||||
+ ctx->text.r_margin.bottom -= hbar->core.height + hbar->core.border_width;
|
||||
+ ctx->text.margin.bottom = ctx->text.r_margin.bottom;
|
||||
+ }
|
||||
/**/
|
||||
if (ctx->text.vbar == NULL)
|
||||
XtRemoveCallback((Widget) ctx, XtNunrealizeCallback, UnrealizeScrollbars,
|
||||
diff -up libXaw3d-1.6.1/src/Viewport.c.hsbar libXaw3d-1.6.1/src/Viewport.c
|
||||
--- libXaw3d-1.6.1/src/Viewport.c.hsbar 2012-01-24 14:56:03.000000000 -0700
|
||||
+++ libXaw3d-1.6.1/src/Viewport.c 2012-02-25 14:58:18.474098582 -0700
|
||||
@@ -244,7 +244,7 @@ Initialize(Widget request, Widget new, A
|
||||
XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
|
||||
if (sw)
|
||||
{
|
||||
- pad = 2;
|
||||
+ pad = 2 * sw;
|
||||
|
||||
arg_cnt = 0;
|
||||
XtSetArg(threeD_args[arg_cnt], XtNborderWidth, 0); arg_cnt++;
|
||||
@@ -262,8 +262,8 @@ Initialize(Widget request, Widget new, A
|
||||
XtSetArg(clip_args[arg_cnt], XtNright, XtChainRight); arg_cnt++;
|
||||
XtSetArg(clip_args[arg_cnt], XtNtop, XtChainTop); arg_cnt++;
|
||||
XtSetArg(clip_args[arg_cnt], XtNbottom, XtChainBottom); arg_cnt++;
|
||||
- XtSetArg(clip_args[arg_cnt], XtNwidth, w->core.width - 2 * sw); arg_cnt++;
|
||||
- XtSetArg(clip_args[arg_cnt], XtNheight, w->core.height - 2 * sw); arg_cnt++;
|
||||
+ XtSetArg(clip_args[arg_cnt], XtNwidth, w->core.width - pad); arg_cnt++;
|
||||
+ XtSetArg(clip_args[arg_cnt], XtNheight, w->core.height - pad); arg_cnt++;
|
||||
|
||||
w->viewport.clip = XtCreateManagedWidget("clip", widgetClass, new,
|
||||
clip_args, arg_cnt);
|
||||
@@ -283,8 +283,8 @@ Initialize(Widget request, Widget new, A
|
||||
* Set the clip widget to the correct height.
|
||||
*/
|
||||
|
||||
- clip_width = w->core.width - 2 * sw;
|
||||
- clip_height = w->core.height - 2 * sw;
|
||||
+ clip_width = w->core.width - pad;
|
||||
+ clip_height = w->core.height - pad;
|
||||
|
||||
if ( (h_bar != NULL) &&
|
||||
((int)w->core.width >
|
||||
@@ -509,23 +509,13 @@ ComputeLayout(Widget widget, Boolean que
|
||||
XtWidgetGeometry intended;
|
||||
Dimension pad = 0, sw = 0;
|
||||
|
||||
- /*
|
||||
- * I've made two optimizations here. The first does away with the
|
||||
- * loop, and the second defers setting the child dimensions to the
|
||||
- * clip if smaller until after adjusting for possible scrollbars.
|
||||
- * If you find that these go too far, define the identifiers here
|
||||
- * as required. -- djhjr
|
||||
- */
|
||||
-#define NEED_LAYOUT_LOOP
|
||||
-#undef PREP_CHILD_TO_CLIP
|
||||
-
|
||||
if (child == (Widget) NULL) return;
|
||||
|
||||
XtVaGetValues(threeD, XtNshadowWidth, &sw, NULL);
|
||||
- if (sw) pad = 2;
|
||||
+ if (sw) pad = 2 * sw;
|
||||
|
||||
- clip_width = w->core.width - 2 * sw;
|
||||
- clip_height = w->core.height - 2 * sw;
|
||||
+ clip_width = w->core.width - pad;
|
||||
+ clip_height = w->core.height - pad;
|
||||
intended.request_mode = CWBorderWidth;
|
||||
intended.border_width = 0;
|
||||
|
||||
@@ -536,10 +526,8 @@ ComputeLayout(Widget widget, Boolean que
|
||||
&clip_width, &clip_height);
|
||||
}
|
||||
else {
|
||||
-#ifdef NEED_LAYOUT_LOOP
|
||||
Dimension prev_width, prev_height;
|
||||
XtGeometryMask prev_mode;
|
||||
-#endif
|
||||
XtWidgetGeometry preferred;
|
||||
|
||||
needshoriz = needsvert = False;
|
||||
@@ -553,31 +541,25 @@ ComputeLayout(Widget widget, Boolean que
|
||||
if (!w->viewport.allowhoriz)
|
||||
intended.request_mode |= CWWidth;
|
||||
|
||||
-#ifdef PREP_CHILD_TO_CLIP
|
||||
- if ((int)child->core.width < clip_width)
|
||||
- intended.width = clip_width;
|
||||
+ if ((int)child->core.width < clip_width + pad)
|
||||
+ intended.width = clip_width + pad;
|
||||
else
|
||||
-#endif
|
||||
intended.width = child->core.width;
|
||||
|
||||
- if (!w->viewport.allowvert)
|
||||
- intended.request_mode |= CWHeight;
|
||||
-
|
||||
-#ifdef PREP_CHILD_TO_CLIP
|
||||
- if ((int)child->core.height < clip_height)
|
||||
- intended.height = clip_height;
|
||||
+ if ((int)child->core.height < clip_height + pad)
|
||||
+ intended.height = clip_height + pad;
|
||||
else
|
||||
-#endif
|
||||
intended.height = child->core.height;
|
||||
|
||||
+ if (!w->viewport.allowvert)
|
||||
+ intended.request_mode |= CWHeight;
|
||||
+
|
||||
if (!query) {
|
||||
preferred.width = child->core.width;
|
||||
preferred.height = child->core.height;
|
||||
}
|
||||
|
||||
-#ifdef NEED_LAYOUT_LOOP
|
||||
do { /* while intended != prev */
|
||||
-#endif
|
||||
if (query) {
|
||||
(void) XtQueryGeometry( child, &intended, &preferred );
|
||||
if ( !(preferred.request_mode & CWWidth) )
|
||||
@@ -585,12 +567,9 @@ ComputeLayout(Widget widget, Boolean que
|
||||
if ( !(preferred.request_mode & CWHeight) )
|
||||
preferred.height = intended.height;
|
||||
}
|
||||
-
|
||||
-#ifdef NEED_LAYOUT_LOOP
|
||||
prev_width = intended.width;
|
||||
prev_height = intended.height;
|
||||
prev_mode = intended.request_mode;
|
||||
-#endif
|
||||
|
||||
/*
|
||||
* Note that having once decided to turn on either bar
|
||||
@@ -600,7 +579,7 @@ ComputeLayout(Widget widget, Boolean que
|
||||
|
||||
#define CheckHoriz() \
|
||||
if (w->viewport.allowhoriz && \
|
||||
- (int)preferred.width > clip_width + 2 * sw) { \
|
||||
++ (int)preferred.width > clip_width + pad) { \
|
||||
if (!needshoriz) { \
|
||||
Widget horiz_bar = w->viewport.horiz_bar; \
|
||||
needshoriz = True; \
|
||||
@@ -615,7 +594,7 @@ ComputeLayout(Widget widget, Boolean que
|
||||
/* enddef */
|
||||
CheckHoriz();
|
||||
if (w->viewport.allowvert &&
|
||||
- (int)preferred.height > clip_height + 2 * sw) {
|
||||
+ (int)preferred.height > clip_height + pad) {
|
||||
if (!needsvert) {
|
||||
Widget vert_bar = w->viewport.vert_bar;
|
||||
needsvert = True;
|
||||
@@ -629,38 +608,22 @@ ComputeLayout(Widget widget, Boolean que
|
||||
intended.height = preferred.height;
|
||||
}
|
||||
|
||||
-#ifdef PREP_CHILD_TO_CLIP
|
||||
if (!w->viewport.allowhoriz ||
|
||||
- (int)preferred.width < clip_width) {
|
||||
- intended.width = clip_width;
|
||||
+ (int)preferred.width < clip_width + pad) {
|
||||
+ intended.width = clip_width + pad;
|
||||
intended.request_mode |= CWWidth;
|
||||
}
|
||||
if (!w->viewport.allowvert ||
|
||||
- (int)preferred.height < clip_height) {
|
||||
- intended.height = clip_height;
|
||||
+ (int)preferred.height < clip_height + pad) {
|
||||
+ intended.height = clip_height + pad;
|
||||
intended.request_mode |= CWHeight;
|
||||
}
|
||||
-#endif
|
||||
-#ifdef NEED_LAYOUT_LOOP
|
||||
+
|
||||
} while ( intended.request_mode != prev_mode ||
|
||||
(intended.request_mode & CWWidth &&
|
||||
intended.width != prev_width) ||
|
||||
(intended.request_mode & CWHeight &&
|
||||
intended.height != prev_height) );
|
||||
-#endif
|
||||
-
|
||||
-#ifndef PREP_CHILD_TO_CLIP
|
||||
- if (!w->viewport.allowhoriz ||
|
||||
- (int)preferred.width < clip_width) {
|
||||
- intended.width = clip_width;
|
||||
- intended.request_mode |= CWWidth;
|
||||
- }
|
||||
- if (!w->viewport.allowvert ||
|
||||
- (int)preferred.height < clip_height) {
|
||||
- intended.height = clip_height;
|
||||
- intended.request_mode |= CWHeight;
|
||||
- }
|
||||
-#endif
|
||||
}
|
||||
|
||||
bar_width = bar_height = 0;
|
||||
@@ -705,7 +668,7 @@ ComputeLayout(Widget widget, Boolean que
|
||||
else {
|
||||
int bw = bar->core.border_width;
|
||||
XtResizeWidget( bar,
|
||||
- (Dimension)(clip_width + 2 * sw), bar->core.height,
|
||||
+ (Dimension)(clip_width + pad), bar->core.height,
|
||||
(Dimension)bw );
|
||||
XtMoveWidget( bar,
|
||||
(Position)((needsvert && !w->viewport.useright)
|
||||
@@ -730,7 +693,7 @@ ComputeLayout(Widget widget, Boolean que
|
||||
else {
|
||||
int bw = bar->core.border_width;
|
||||
XtResizeWidget( bar,
|
||||
- bar->core.width, (Dimension)(clip_height + 2 * sw),
|
||||
+ bar->core.width, (Dimension)(clip_height + pad),
|
||||
(Dimension)bw );
|
||||
XtMoveWidget( bar,
|
||||
(Position)(w->viewport.useright
|
||||
@@ -780,7 +743,7 @@ ComputeWithForceBars(Widget widget, Bool
|
||||
*/
|
||||
|
||||
XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
|
||||
- if (sw) pad = 2;
|
||||
+ if (sw) pad = 2 * sw;
|
||||
|
||||
if (w->viewport.allowvert) {
|
||||
if (w->viewport.vert_bar == NULL)
|
||||
@@ -926,7 +889,7 @@ GeometryRequestPlusScrollbar(ViewportWid
|
||||
Dimension pad = 0, sw = 0;
|
||||
|
||||
XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
|
||||
- if (sw) pad = 2;
|
||||
+ if (sw) pad = 2 * sw;
|
||||
|
||||
plusScrollbars = *request;
|
||||
if ((bar = w->viewport.horiz_bar) == (Widget)NULL)
|
||||
@@ -997,7 +960,7 @@ GeometryManager(Widget child, XtWidgetGe
|
||||
return XtGeometryNo;
|
||||
|
||||
XtVaGetValues((Widget)(w->viewport.threeD), XtNshadowWidth, &sw, NULL);
|
||||
- if (sw) pad = 2;
|
||||
+ if (sw) pad = 2 * sw;
|
||||
|
||||
allowed = *request;
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>Xaw3d</Name>
|
||||
<Homepage>http://freshmeat.net/projects/xaw3d/</Homepage>
|
||||
<Packager>
|
||||
<Name>PisiLinux Community</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Packager>
|
||||
<License>X11</License>
|
||||
<IsA>library</IsA>
|
||||
<Summary>Replacement of the Xaw widget set that comes with X</Summary>
|
||||
<Description>Xaw3d is a general-purpose replacement for the Athena toolkit that adds a 3D appearance and support for XPM images.</Description>
|
||||
<Archive sha1sum="c01bf719032f2da0da0b92344570528c51775d41" type="targz">http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-1.6.2.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>util-macros</Dependency>
|
||||
<Dependency>libXt-devel</Dependency>
|
||||
<Dependency>libXmu-devel</Dependency>
|
||||
<Dependency>libXpm-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">Xaw3d-1.6.1-3Dlabel.patch</Patch>
|
||||
<Patch level="1">Xaw3d-1.6.1-fontset.patch</Patch>
|
||||
<Patch level="1">Xaw3d-1.6.1-hsbar.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>Xaw3d</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libXt</Dependency>
|
||||
<Dependency>libX11</Dependency>
|
||||
<Dependency>libXmu</Dependency>
|
||||
<Dependency>libXpm</Dependency>
|
||||
<Dependency>libXext</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<Name>Xaw3d-devel</Name>
|
||||
<Summary>Development files for Xaw3d</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">Xaw3d</Dependency>
|
||||
<Dependency>libXt-devel</Dependency>
|
||||
<Dependency>libX11-devel</Dependency>
|
||||
<Dependency>libXmu-devel</Dependency>
|
||||
<Dependency>libXext-devel</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="header">/usr/include</Path>
|
||||
<Path fileType="data">/usr/lib/pkgconfig</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="5">
|
||||
<Date>2016-02-21</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Release bump.</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="4">
|
||||
<Date>2013-10-07</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Rebuild.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="3">
|
||||
<Date>2013-08-25</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Release bump.</Comment>
|
||||
<Name>Marcin Bojara</Name>
|
||||
<Email>marcin@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2013-07-26</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>Release bump for rebuild.</Comment>
|
||||
<Name>Serdar Soytetir</Name>
|
||||
<Email>kaptan@pisilinux.org</Email>
|
||||
</Update>
|
||||
<Update release="1">
|
||||
<Date>2012-06-01</Date>
|
||||
<Version>1.6.2</Version>
|
||||
<Comment>First release</Comment>
|
||||
<Name>Erdem Artan</Name>
|
||||
<Email>admins@pisilinux.org</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" ?>
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>Xaw3d</Name>
|
||||
<Summary xml:lang="tr">XPM imajlarına 3D görüntüsü ve desteği ekleyen bir kütüphanedir</Summary>
|
||||
<Description xml:lang="tr">Xaw3d, Athena araçlarının yerini alması amaçlanarak hazırlanmıştır. Ek olarak 3B görünüş sağlar ve XPM resimlerini destekler.</Description>
|
||||
<Description xml:lang="fr">Xaw3d est globalement le remplaçant de la boîte à outils Athena. Il ajoute une apparence 3D ainsi que le support des images XMP.</Description>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>Xaw3d-devel</Name>
|
||||
<Summary xml:lang="tr">Xaw3d için geliştirme dosyaları</Summary>
|
||||
</Package>
|
||||
</PISI>
|
||||
Reference in New Issue
Block a user