external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

dtcalc: Remove more 'extern' variables in .c files, by putting them in .h. Also reduce scope of vars and funcs with static.

Browse source
This commit is contained in:
Peter Howkins 2021-11-25 04:29:25 +00:00
parent a9175c896d
commit 9f8dbf6a6c
10 changed files with 94 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtcalc/Makefile.am
View file

@ -12,6 +12,6 @@ endif
dtcalc_SOURCES = calctool.c ds_common.c ds_popup.c ds_widget.c \ dtcalc_SOURCES = calctool.c ds_common.c ds_popup.c ds_widget.c \
ds_xlib.c functions.c help.c motif.c mp.c text.c \ ds_xlib.c functions.c help.c motif.c mp.c text.c text.h \
calctool.h ds_popup.h ds_xlib.h patchlevel.h \ calctool.h ds_popup.h ds_xlib.h patchlevel.h \
ds_common.h ds_widget.h motif.h ds_common.h ds_widget.h motif.h

47
cde/programs/dtcalc/calctool.c
View file

@ -37,6 +37,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <time.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/param.h> #include <sys/param.h>
@ -45,74 +46,60 @@
#include "patchlevel.h" #include "patchlevel.h"
#include "calctool.h" #include "calctool.h"
#include "ds_common.h" #include "ds_common.h"
#include "calctool.h"
#include "text.h"
time_t time() ; static double max_fix[4] = {
double max_fix[4] = {
6.871947674e+10, 3.245185537e+32, 6.871947674e+10, 3.245185537e+32,
1.000000000e+36, 2.230074520e+43 1.000000000e+36, 2.230074520e+43
} ; } ;
double min_fix0[4] = { static double min_fix0[4] = {
2.500000000e-1, 3.750000000e-1, 2.500000000e-1, 3.750000000e-1,
1.000000000e-1, 4.375000000e-1 1.000000000e-1, 4.375000000e-1
} ; } ;
double min_fix1[4] = { static double min_fix1[4] = {
1.250000000e-1, 4.687500000e-2, 1.250000000e-1, 4.687500000e-2,
1.000000000e-2, 2.734375000e-2 1.000000000e-2, 2.734375000e-2
} ; } ;
double min_fix2[4] = { static double min_fix2[4] = {
6.250000000e-2, 5.859375000e-3, 6.250000000e-2, 5.859375000e-3,
1.000000000e-3, 1.708984375e-3 1.000000000e-3, 1.708984375e-3
} ; } ;
double min_fix3[4] = { static double min_fix3[4] = {
3.125000000e-2, 7.324218750e-4, 3.125000000e-2, 7.324218750e-4,
1.000000000e-4, 1.068115234e-4 1.000000000e-4, 1.068115234e-4
} ; } ;
double min_fix4[4] = { static double min_fix4[4] = {
1.562500000e-2, 9.155273437e-5, 1.562500000e-2, 9.155273437e-5,
1.000000000e-5, 6.675720215e-6 1.000000000e-5, 6.675720215e-6
} ; } ;
double min_fix5[4] = { static double min_fix5[4] = {
7.812500000e-3, 1.144409180e-5, 7.812500000e-3, 1.144409180e-5,
1.000000000e-6, 4.172325134e-7 1.000000000e-6, 4.172325134e-7
} ; } ;
double min_fix6[4] = { static double min_fix6[4] = {
6.906250000e-3, 1.430511475e-6, 6.906250000e-3, 1.430511475e-6,
1.000000000e-7, 2.607703209e-8 1.000000000e-7, 2.607703209e-8
} ; } ;
double min_fix7[4] = { static double min_fix7[4] = {
1.953125000e-3, 1.788139343e-7, 1.953125000e-3, 1.788139343e-7,
1.000000000e-8, 1.629814506e-9 1.000000000e-8, 1.629814506e-9
} ; } ;
double min_fix8[4] = { static double min_fix8[4] = {
9.765625000e-4, 2.235174179e-8, 9.765625000e-4, 2.235174179e-8,
1.000000000e-9, 1.018634066e-10 1.000000000e-9, 1.018634066e-10
} ; } ;
double min_fix9[4] = { static double min_fix9[4] = {
4.882812500e-4, 2.793967724e-9, 4.882812500e-4, 2.793967724e-9,
1.000000000e-10, 6.366462912e-12 1.000000000e-10, 6.366462912e-12
} ; } ;
extern char *base_str[] ; /* Strings for each base value. */ static char digits[] = "0123456789ABCDEF" ;
extern char *cmdstr[] ; /* Strings for each command line option. */ static int basevals[4] = { 2, 8, 10, 16 } ;
extern char *dtype_str[] ; /* Strings for each display mode value. */
extern char *lstrs[] ; /* Labels for various Motif items. */
extern char *mess[] ; /* Message strings. */
extern char *mode_str[] ; /* Strings for each mode value. */
extern char *opts[] ; /* Command line option strings. */
extern char *ttype_str[] ; /* Strings for each trig type value. */
extern char *ustrs[] ; /* Usage message strings. */
extern char *vstrs[] ; /* Various strings. */
char digits[] = "0123456789ABCDEF" ;
int basevals[4] = { 2, 8, 10, 16 } ;
int left_pos[BCOLS] = { 3, 2, 1, 0 } ; /* Left positions. */
int right_pos[BCOLS] = { 0, 1, 2, 3 } ; /* "Right" positions. */
/* Valid keys when an error condition has occurred. */ /* Valid keys when an error condition has occurred. */
/* MEM KEYS clr clr QUIT REDRAW */ /* MEM KEYS clr clr QUIT REDRAW */
char validkeys[MAXVKEYS] = { 'm', 'k', '\177', '\013', 'q', '\f' } ; static char validkeys[MAXVKEYS] = { 'm', 'k', '\177', '\013', 'q', '\f' } ;
Vars v ; /* Calctool variables and options. */ Vars v ; /* Calctool variables and options. */

12
cde/programs/dtcalc/calctool.h
View file

@ -442,11 +442,14 @@ struct button {
char *resname ; /* Button resource name. */ char *resname ; /* Button resource name. */
void (*func)() ; /* Function to obey on button press. */ void (*func)() ; /* Function to obey on button press. */
} ; } ;
extern struct button buttons[] ; /* Calculator button values. */
extern struct button mode_buttons[] ; /* Special "mode" buttons. */
struct menu_entry { struct menu_entry {
char *str ; /* Menu entry string to be displayed. */ char *str ; /* Menu entry string to be displayed. */
char val ; /* Value when selected. */ char val ; /* Value when selected. */
} ; } ;
extern struct menu_entry menu_entries[] ; /* All the menu strings. */
struct menu { struct menu {
char *title ; /* Menu title. */ char *title ; /* Menu title. */
@ -454,6 +457,7 @@ struct menu {
int mindex ; /* Index into menu string array. */ int mindex ; /* Index into menu string array. */
int defval ; /* Default menu item position (from 1). */ int defval ; /* Default menu item position (from 1). */
} ; } ;
extern struct menu cmenus[] ; /* Calculator menus. */
struct calcVars { /* Calctool variables and options. */ struct calcVars { /* Calctool variables and options. */
char *appname ; /* Application name for resources. */ char *appname ; /* Application name for resources. */
@ -539,6 +543,11 @@ struct calcVars { /* Calctool variables and options. */
extern struct calcVars CalcVars; extern struct calcVars CalcVars;
typedef struct calcVars *Vars ; typedef struct calcVars *Vars ;
extern Vars v ; /* Calctool variables and options. */
extern void matherr(void); // calctool.c
/* Structure, resource definitions, for View's optional parameters. */ /* Structure, resource definitions, for View's optional parameters. */
typedef struct typedef struct
@ -754,10 +763,7 @@ void mpunfl(int *);
void Help(char *, char *); void Help(char *, char *);
void HelpRequestCB(Widget, caddr_t, caddr_t); void HelpRequestCB(Widget, caddr_t, caddr_t);
void HelpModeCB(Widget, caddr_t, caddr_t); void HelpModeCB(Widget, caddr_t, caddr_t);
void HelpCloseCB(Widget, caddr_t, caddr_t);
void HelpHyperlinkCB(Widget, caddr_t, caddr_t);
void DisplayHelp(char *, char *); void DisplayHelp(char *, char *);
void CenterMsgCB(Widget, XtPointer, XtPointer);
void HelpHelp(void); void HelpHelp(void);
void SetWmHnts(void); void SetWmHnts(void);

16
cde/programs/dtcalc/functions.c
View file

@ -41,21 +41,7 @@
#include <ieeefp.h> #include <ieeefp.h>
#endif #endif
#include "calctool.h" #include "calctool.h"
#include "text.h"
void matherr(void); // calctool.c
extern char *base_str[] ; /* Strings for each base value. */
extern char *dtype_str[] ; /* Strings for each display mode value. */
extern char *mode_str[] ; /* Strings for each mode value. */
extern char *ttype_str[] ; /* Strings for each trig type value. */
extern char *vstrs[] ; /* Various strings. */
extern struct button buttons[] ; /* Calculator button values. */
extern struct button mode_buttons[] ; /* Special "mode" buttons. */
extern struct menu_entry menu_entries[] ; /* All the menu strings. */
extern Vars v ; /* Calctool variables and options. */
double mods[] = { 1.0, 1.0e-1, 1.0e-2, 1.0e-3, 1.0e-4, double mods[] = { 1.0, 1.0e-1, 1.0e-2, 1.0e-3, 1.0e-4,
1.0e-5, 1.0e-6, 1.0e-7, 1.0e-8, 1.0e-9, 1.0e-5, 1.0e-6, 1.0e-7, 1.0e-8, 1.0e-9,

21
cde/programs/dtcalc/help.c
View file

@ -43,19 +43,10 @@
#include <stdint.h> #include <stdint.h>
#include "calctool.h" #include "calctool.h"
#include "motif.h" #include "motif.h"
#include "text.h"
#define DIALOG_MWM_FUNC MWM_FUNC_MOVE | MWM_FUNC_CLOSE #define DIALOG_MWM_FUNC MWM_FUNC_MOVE | MWM_FUNC_CLOSE
extern char *base_str[] ; /* Strings for each base value. */
extern char *dtype_str[] ; /* Strings for each display mode value. */
extern char *mode_str[] ; /* Strings for each mode value. */
extern char *ttype_str[] ; /* Strings for each trig type value. */
extern Vars v ; /* Calctool variables and options. */
extern struct button buttons[] ; /* Calculator button values. */
extern Boolean ignore_event;
extern XtIntervalId timerId;
extern void _DtChildPosition(Widget, Widget, Position *, Position *); extern void _DtChildPosition(Widget, Widget, Position *, Position *);
typedef struct _helpStruct { typedef struct _helpStruct {
@ -67,6 +58,10 @@ typedef struct _helpStruct {
static Widget GetHelpDialog(void); static Widget GetHelpDialog(void);
static void UnmanageCB(Widget, XtPointer, XtPointer) ; static void UnmanageCB(Widget, XtPointer, XtPointer) ;
static void CenterMsgCB(Widget, XtPointer, XtPointer);
static void HelpHyperlinkCB(Widget, caddr_t, caddr_t);
static void HelpCloseCB(Widget, caddr_t, caddr_t);
void void
Help(char *helpVolume, char *locationId) Help(char *helpVolume, char *locationId)
@ -118,7 +113,7 @@ Help(char *helpVolume, char *locationId)
} }
void static void
HelpCloseCB(Widget widget, caddr_t client_data, caddr_t call_data) HelpCloseCB(Widget widget, caddr_t client_data, caddr_t call_data)
{ {
@ -135,7 +130,7 @@ HelpCloseCB(Widget widget, caddr_t client_data, caddr_t call_data)
X->helpMapped = False; X->helpMapped = False;
} }
void static void
HelpHyperlinkCB(Widget widget, caddr_t client_data, caddr_t call_data) HelpHyperlinkCB(Widget widget, caddr_t client_data, caddr_t call_data)
{ {
DtHelpDialogCallbackStruct *pHyper = (DtHelpDialogCallbackStruct *) call_data; DtHelpDialogCallbackStruct *pHyper = (DtHelpDialogCallbackStruct *) call_data;
@ -534,7 +529,7 @@ UnmanageCB(Widget widget, XtPointer client_data, XtPointer call_data)
XtUnmanageChild(widget); XtUnmanageChild(widget);
} }
void static void
CenterMsgCB (Widget widget, XtPointer client_data, XtPointer call_data) CenterMsgCB (Widget widget, XtPointer client_data, XtPointer call_data)
{ {
int n; int n;

47
cde/programs/dtcalc/motif.c
View file

@ -111,12 +111,14 @@ extern XmWidgetExtData _XmGetWidgetExtData(
#include "ds_common.h" #include "ds_common.h"
#include "ds_popup.h" #include "ds_popup.h"
#include "ds_xlib.h" #include "ds_xlib.h"
#include "text.h"
Pixmap _DtGetMask(Screen *screen, char *image_name); // DtSvc/DtUtil2/XmWrap.c Pixmap _DtGetMask(Screen *screen, char *image_name); // DtSvc/DtUtil2/XmWrap.c
ApplicationArgs application_args; ApplicationArgs application_args;
XVars X; XVars X;
Boolean colorSrv; Boolean ignore_event = False;
XtIntervalId timerId = 0;
static XtResource resources[] = static XtResource resources[] =
{ {
@ -152,17 +154,15 @@ static XtResource resources[] =
}, },
}; };
char DTCALC_CLASS_NAME[] = "Dtcalc"; static char DTCALC_CLASS_NAME[] = "Dtcalc";
extern char *opts[] ; /* Command line option strings. */ static Widget modeArry[3];
static XmPixelSet pixels[XmCO_MAX_NUM_COLORS];
static Pixel white_pixel;
static Pixel black_pixel;
static Boolean BlackWhite = False;
Widget modeArry[3]; static char * dt_path = NULL;
XmPixelSet pixels[XmCO_MAX_NUM_COLORS];
Pixel white_pixel;
Pixel black_pixel;
Boolean BlackWhite = False;
char * dt_path = NULL;
static Widget funBtn = NULL; static Widget funBtn = NULL;
static Widget constBtn = NULL; static Widget constBtn = NULL;
@ -175,12 +175,11 @@ static Atom saveatom ;
static Atom command_atom ; static Atom command_atom ;
static Atom wm_state_atom; static Atom wm_state_atom;
Boolean ignore_event = False;
XtIntervalId timerId = 0;
static int lastArmed[10]; static int lastArmed[10];
static int countArmed = 0; static int countArmed = 0;
static Boolean colorSrv;
/* Structure used on a save session to see if a dt is iconic */ /* Structure used on a save session to see if a dt is iconic */
typedef struct typedef struct
{ {
@ -235,27 +234,7 @@ static void create_menu_bar(Widget parent);
static void init_colors(void); static void init_colors(void);
static void create_popup(Widget parent); static void create_popup(Widget parent);
static char translations_return[] = "<Key>Return:ManagerGadgetSelect()";
extern char **environ ;
extern char *base_str[] ; /* Strings for each base value. */
extern char *calc_res[] ; /* Calctool X resources. */
extern char *dtype_str[] ; /* Strings for each display mode value. */
extern char *lstrs[] ; /* Labels for various Motif items. */
extern char *mess[] ; /* Message strings. */
extern char *mode_str[] ; /* Strings for each mode value. */
extern char *pstrs[] ; /* Property sheet strings. */
extern char *ttype_str[] ; /* Strings for each trig type value. */
extern char *vstrs[] ; /* Various strings. */
extern struct button buttons[] ; /* Calculator button values. */
extern struct button mode_buttons[] ; /* Calculator mode button values. */
extern struct menu cmenus[] ; /* Calculator menus. */
extern struct menu_entry menu_entries[] ; /* All the menu strings. */
extern Vars v ; /* Calctool variables and options. */
char translations_return[] = "<Key>Return:ManagerGadgetSelect()";
static Boolean NoDisplay=False; static Boolean NoDisplay=False;
extern XtPointer _XmStringUngenerate ( extern XtPointer _XmStringUngenerate (

2
cde/programs/dtcalc/motif.h
View file

@ -88,6 +88,8 @@ typedef struct Xobject { /* Motif/Xlib graphics object. */
typedef struct Xobject *XVars ; typedef struct Xobject *XVars ;
extern XVars X ; extern XVars X ;
extern XtIntervalId timerId;
extern Boolean ignore_event;
#ifndef CDE_INSTALLATION_TOP #ifndef CDE_INSTALLATION_TOP
#define CDE_INSTALLATION_TOP "/usr/dt" #define CDE_INSTALLATION_TOP "/usr/dt"

7
cde/programs/dtcalc/mp.c
View file

@ -53,6 +53,7 @@
#include <math.h> #include <math.h>
#include "calctool.h" #include "calctool.h"
#include <Dt/Dt.h> #include <Dt/Dt.h>
#include "text.h"
struct { struct {
int b, t, m, mxr, r[MP_SIZE] ; int b, t, m, mxr, r[MP_SIZE] ;
@ -78,12 +79,6 @@ static int c__239 = 239 ;
static int c__7 = 7 ; static int c__7 = 7 ;
static int c__16 = 16 ; static int c__16 = 16 ;
extern char *mpstrs[] ; /* MP errors (visible with -D option). */
extern char *vstrs[] ; /* Various strings. */
extern Vars v ; /* Calctool variables and options. */
void void
mpabs(int *x, int *y) mpabs(int *x, int *y)
{ {

11
cde/programs/dtcalc/text.c
View file

@ -36,14 +36,7 @@
#include "calctool.h" #include "calctool.h"
#include "ds_common.h" #include "ds_common.h"
extern struct button buttons[] ; /* Calculator button values. */ static void init_mess(void);
extern struct button mode_buttons[] ; /* Special "mode" buttons. */
extern struct menu cmenus[] ; /* Calculator menus. */
extern struct menu_entry menu_entries[] ; /* All the menu strings. */
extern Vars v ; /* Calctool variables and options. */
void init_mess(void);
/* The following are all the strings used by the dtcalc program. /* The following are all the strings used by the dtcalc program.
* They are initialized in init_text() to the local language equivalents. * They are initialized in init_text() to the local language equivalents.
@ -630,7 +623,7 @@ init_text(void) /* Setup text strings depending upon language. */
} }
void static void
init_mess(void) /* Setup text strings depending upon language. */ init_mess(void) /* Setup text strings depending upon language. */
{ {
int i ; int i ;

40
cde/programs/dtcalc/text.h Normal file
View file

@ -0,0 +1,40 @@
/*
* CDE - Common Desktop Environment
*
* Copyright (c) 2021 Peter Howkins. All rights reserved.
*
* These libraries and programs are free software; you can
* redistribute them and/or modify them under the terms of the GNU
* Lesser General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* These libraries and programs are distributed in the hope that
* they will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU Lesser General Public License for more
* details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with these libraries and programs; if not, write
* to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
* Floor, Boston, MA 02110-1301 USA
*/
#ifndef __TEXT_H
#define __TEXT_H
extern char *base_str[] ; /* Strings for each base value. */
extern char *dtype_str[] ; /* Strings for each display mode value. */
extern char *cmdstr[] ; /* Strings for each command line option. */
extern char *calc_res[] ; /* Calctool X resources. */
extern char *lstrs[] ; /* Labels for various Motif items. */
extern char *mess[] ; /* Message strings. */
extern char *mode_str[] ; /* Strings for each mode value. */
extern char *ttype_str[] ; /* Strings for each trig type value. */
extern char *vstrs[] ; /* Various strings. */
extern char *mpstrs[] ; /* MP errors (visible with -D option). */
extern char *pstrs[] ; /* Property sheet strings. */
extern char *opts[] ; /* Command line option strings. */
extern char *ustrs[] ; /* Usage message strings. */
#endif /* __TEXT_H */