casa-mp-base

From 2bf9cbaa9a6398725cf34912314a1d4cdc62a402 Mon Sep 17 00:00:00 2001

From: Markus Steinborn <gnugv_maintainer@yahoo.de>

Date: Thu, 1 Mar 2012 18:10:29 +0100

Subject: [PATCH 3/3] Xaw3d-1.6.1-hsbar.patch

​

---

 src/Text.c     |   12 +++++---

 src/Viewport.c |   91 +++++++++++++++++---------------------------------------

 2 files changed, 35 insertions(+), 68 deletions(-)

​

diff --git libXaw3d-1.6.2/src/Text.c libXaw3d-1.6.2/src/Text.c

index b0e7a2c..1b09ba4 100644

--- libXaw3d-1.6.2/src/Text.c

+++ libXaw3d-1.6.2/src/Text.c

@@ -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 --git libXaw3d-1.6.2/src/Viewport.c libXaw3d-1.6.2/src/Viewport.c

index a37a9a1..602449a 100644

--- libXaw3d-1.6.2/src/Viewport.c

+++ libXaw3d-1.6.2/src/Viewport.c

@@ -244,7 +244,7 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)

     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, ArgList args, Cardinal *num_args)

     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,