[4633] in Athena Bugs
Changes to Xquota for x11r4
daemon@ATHENA.MIT.EDU (epeisach@ATHENA.MIT.EDU)
Wed Mar 28 19:40:27 1990
From: epeisach@ATHENA.MIT.EDU
Date: Wed, 28 Mar 90 19:40:11 -0500
To: bugs@ATHENA.MIT.EDU
*** /tmp/,RCSt1001230 Wed Mar 28 19:39:11 1990
--- widgets.c Wed Mar 28 19:29:16 1990
***************
*** 27,38 ****
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
! #include <X11/AsciiText.h>
! #include <X11/Command.h>
! #include <X11/Label.h>
! #include <X11/Scroll.h>
#include <X11/Shell.h>
! #include <X11/Paned.h>
#include "xquota.h"
--- 27,38 ----
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
! #include <X11/Xaw/AsciiText.h>
! #include <X11/Xaw/Command.h>
! #include <X11/Xaw/Label.h>
! #include <X11/Xaw/Scrollbar.h>
#include <X11/Shell.h>
! #include <X11/Xaw/Paned.h>
#include "xquota.h"
***************
*** 186,192 ****
Info * info;
{
Widget pane;
! Arg arglist[5];
Cardinal num_args;
Dimension width, height;
Position x, y;
--- 186,192 ----
Info * info;
{
Widget pane;
! Arg arglist[7];
Cardinal num_args;
Dimension width, height;
Position x, y;
***************
*** 218,230 ****
strcpy(string, SAFE_MESSAGE);
num_args = 0;
! XtSetArg( arglist[num_args], XtNtextOptions, scrollVertical | wordBreak);
num_args++;
! XtSetArg( arglist[num_args], XtNeditType, XttextEdit); num_args++;
XtSetArg( arglist[num_args], XtNlength, TEXT_BUFFER_LENGTH); num_args++;
XtSetArg( arglist[num_args], XtNstring, string); num_args++;
info->message_widget = XtCreateManagedWidget("message",
! asciiStringWidgetClass, pane,
arglist, num_args);
CreateButtonPane(info, pane);
--- 218,232 ----
strcpy(string, SAFE_MESSAGE);
num_args = 0;
! XtSetArg( arglist[num_args], XtNscrollVertical, XawtextScrollWhenNeeded);
num_args++;
! XtSetArg( arglist[num_args], XtNwrap, XawtextWrapWord); num_args++;
! XtSetArg( arglist[num_args], XtNeditType, XawtextEdit); num_args++;
XtSetArg( arglist[num_args], XtNlength, TEXT_BUFFER_LENGTH); num_args++;
XtSetArg( arglist[num_args], XtNstring, string); num_args++;
+ XtSetArg( arglist[num_args], XtNuseStringInPlace, TRUE); num_args++;
info->message_widget = XtCreateManagedWidget("message",
! asciiTextWidgetClass, pane,
arglist, num_args);
CreateButtonPane(info, pane);
***************
*** 352,362 ****
XtAddCallback(kill, XtNcallback, KillHelpProc, (caddr_t) shell);
num_args = 0;
! XtSetArg( arglist[num_args], XtNtextOptions, scrollVertical | wordBreak ) ;
num_args++;
! XtSetArg( arglist[num_args], XtNfile, filename ) ;
! num_args++;
! (void) XtCreateManagedWidget("text", asciiDiskWidgetClass, pane,
arglist, num_args);
return(shell);
}
--- 354,365 ----
XtAddCallback(kill, XtNcallback, KillHelpProc, (caddr_t) shell);
num_args = 0;
! XtSetArg( arglist[num_args], XtNscrollVertical, XawtextScrollWhenNeeded);
num_args++;
! XtSetArg( arglist[num_args], XtNwrap, XawtextWrapWord); num_args++;
! XtSetArg( arglist[num_args], XtNstring, filename ) ; num_args++;
! XtSetArg( arglist[num_args], XtNtype, XawAsciiFile ) ; num_args++;
! (void) XtCreateManagedWidget("text", asciiTextWidgetClass, pane,
arglist, num_args);
return(shell);
}
***************
*** 731,737 ****
temp = ( (float) used ) / ( (float) quota);
if ( temp > 1.0 ) temp = 1.0;
! XtScrollBarSetThumb( w, 1.0 - temp, temp );
temp *= 100;
if ( (((int) temp) >= info->warn && !info->flipped) ||
(((int) temp) < info->warn && info->flipped) ) {
--- 734,740 ----
temp = ( (float) used ) / ( (float) quota);
if ( temp > 1.0 ) temp = 1.0;
! XawScrollbarSetThumb( w, 1.0 - temp, temp );
temp *= 100;
if ( (((int) temp) >= info->warn && !info->flipped) ||
(((int) temp) < info->warn && info->flipped) ) {
***************
*** 755,761 ****
Widget w;
char * string;
{
! XtTextBlock t_block;
t_block.firstPos = 0;
t_block.length = strlen(string);
--- 758,764 ----
Widget w;
char * string;
{
! XawTextBlock t_block;
t_block.firstPos = 0;
t_block.length = strlen(string);
***************
*** 762,768 ****
t_block.ptr = string;
t_block.format = FMT8BIT;
! if (XtTextReplace(w, 0, TEXT_BUFFER_LENGTH, &t_block) != XawEditDone)
printf("Xquota Error: could not replace text string.\n");
}
--- 765,771 ----
t_block.ptr = string;
t_block.format = FMT8BIT;
! if (XawTextReplace(w, 0, TEXT_BUFFER_LENGTH, &t_block) != XawEditDone)
printf("Xquota Error: could not replace text string.\n");
}
No differences encountered
