Skip to content

P
proview
Commit 9600a8df authored by claes's avatar claes
Browse files
Options

Co added to classname to avoid collision with xtt's xhelp

parent 05edceec
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 103 deletions
src/lib/co/src/co_xhelp.cpp
View file @ 9600a8df
......@@ -43,13 +43,13 @@ extern "C" {
#include "co_xhelpnav.h"
#include "co_xhelp.h"
XHelp *XHelp::default_xhelp = 0;
CoXHelp *CoXHelp::default_xhelp = 0;
// Prototype declarations
static void xhelp_open_input_dialog( XHelp *xhelp, char *text, char *title,
static void xhelp_open_input_dialog( CoXHelp *xhelp, char *text, char *title,
char *init_text,
void (*ok_cb)( XHelp *, char *))
void (*ok_cb)( CoXHelp *, char *))
{
Arg args[10];
int i;
......@@ -75,12 +75,12 @@ static void xhelp_open_input_dialog( XHelp *xhelp, char *text, char *title,
xhelp->india_ok_cb = ok_cb;
}
static void xhelp_find_ok( XHelp *xhelp, char *search_str)
static void xhelp_find_ok( CoXHelp *xhelp, char *search_str)
{
xhelp->xhelpnav->search( search_str, false);
}
static void xhelp_activate_exit( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_exit( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
if ( xhelp->close_cb)
(xhelp->close_cb)( xhelp->parent_ctx, (void *)xhelp);
......@@ -91,7 +91,7 @@ static void xhelp_activate_exit( Widget w, XHelp *xhelp, XmAnyCallbackStruct *da
// delete xhelp;
}
static void xhelp_activate_zoom_in( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_zoom_in( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
double zoom_factor;
......@@ -102,7 +102,7 @@ static void xhelp_activate_zoom_in( Widget w, XHelp *xhelp, XmAnyCallbackStruct
xhelp->xhelpnav->zoom( 1.18);
}
static void xhelp_activate_zoom_out( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_zoom_out( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
double zoom_factor;
......@@ -113,36 +113,36 @@ static void xhelp_activate_zoom_out( Widget w, XHelp *xhelp, XmAnyCallbackStruct
xhelp->xhelpnav->zoom( 1.0 / 1.18);
}
static void xhelp_activate_zoom_reset( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_zoom_reset( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
xhelp->xhelpnav->unzoom();
}
static void xhelp_activate_search( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_search( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
xhelp_open_input_dialog( xhelp, "Search string", "Search string",
"", &xhelp_find_ok);
}
static void xhelp_activate_searchnext( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_searchnext( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
xhelp->xhelpnav->search_next();
}
static void xhelp_activate_searchprevious( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_searchprevious( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
xhelp->xhelpnav->search_next_reverse();
}
static void xhelp_create_india_label( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_create_india_label( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
xhelp->india_label = w;
}
static void xhelp_create_india_text( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_create_india_text( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
xhelp->india_text = w;
}
static void xhelp_activate_india_ok( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_india_ok( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
char *value;
......@@ -151,27 +151,27 @@ static void xhelp_activate_india_ok( Widget w, XHelp *xhelp, XmAnyCallbackStruct
(xhelp->india_ok_cb)( xhelp, value);
}
static void xhelp_activate_india_cancel( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_india_cancel( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
XtUnmanageChild( xhelp->india_widget);
}
static void xhelp_activate_help( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_activate_help( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
XHelp::dhelp( "helpwindow", 0, navh_eHelpFile_Base, 0, true);
CoXHelp::dhelp( "helpwindow", 0, navh_eHelpFile_Base, 0, true);
}
static void xhelp_create_xhelpnav_form( Widget w, XHelp *xhelp, XmAnyCallbackStruct *data)
static void xhelp_create_xhelpnav_form( Widget w, CoXHelp *xhelp, XmAnyCallbackStruct *data)
{
xhelp->xhelpnav_form = w;
}
static void xhelp_enable_set_focus( XHelp *xhelp)
static void xhelp_enable_set_focus( CoXHelp *xhelp)
{
xhelp->set_focus_disabled--;
}
static void xhelp_disable_set_focus( XHelp *xhelp, int time)
static void xhelp_disable_set_focus( CoXHelp *xhelp, int time)
{
xhelp->set_focus_disabled++;
xhelp->focus_timerid = XtAppAddTimeOut(
......@@ -182,7 +182,7 @@ static void xhelp_disable_set_focus( XHelp *xhelp, int time)
static void xhelp_action_inputfocus( Widget w, XmAnyCallbackStruct *data)
{
Arg args[1];
XHelp *xhelp;
CoXHelp *xhelp;
XtSetArg (args[0], XmNuserData, &xhelp);
XtGetValues (w, args, 1);
......@@ -204,19 +204,19 @@ static void xhelp_action_inputfocus( Widget w, XmAnyCallbackStruct *data)
}
void XHelp::pop()
void CoXHelp::pop()
{
((XHelpNav*)xhelpnav)->pop();
((CoXHelpNav*)xhelpnav)->pop();
displayed = 1;
}
void XHelp::clear()
void CoXHelp::clear()
{
xhelpnav->brow_push_all();
xhelpnav->clear();
}
int XHelp::help( char *key, char *help_bookmark, navh_eHelpFile file_type,
int CoXHelp::help( char *key, char *help_bookmark, navh_eHelpFile file_type,
char *file_name, bool strict)
{
return xhelpnav->help( key, help_bookmark, file_type,
......@@ -226,7 +226,7 @@ int XHelp::help( char *key, char *help_bookmark, navh_eHelpFile file_type,
//
// Static function to call help for the default xhelp
//
int XHelp::dhelp( char *key, char *help_bookmark, navh_eHelpFile file_type,
int CoXHelp::dhelp( char *key, char *help_bookmark, navh_eHelpFile file_type,
char *file_name, bool strict)
{
if ( !default_xhelp)
......@@ -239,12 +239,12 @@ int XHelp::dhelp( char *key, char *help_bookmark, navh_eHelpFile file_type,
}
int XHelp::help_index( navh_eHelpFile file_type, char *file_name)
int CoXHelp::help_index( navh_eHelpFile file_type, char *file_name)
{
return xhelpnav->help_index( file_type, file_name, 0);
}
int XHelp::dhelp_index( navh_eHelpFile file_type, char *file_name)
int CoXHelp::dhelp_index( navh_eHelpFile file_type, char *file_name)
{
if ( !default_xhelp)
return 0;
......@@ -254,7 +254,7 @@ int XHelp::dhelp_index( navh_eHelpFile file_type, char *file_name)
return default_xhelp->help_index( file_type, file_name);
}
void XHelp::set_dimension( int width, int height)
void CoXHelp::set_dimension( int width, int height)
{
Arg args[3];
......@@ -268,7 +268,7 @@ void XHelp::set_dimension( int width, int height)
XtSetValues( toplevel, args,i);
}
XHelp::~XHelp()
CoXHelp::~CoXHelp()
{
if ( set_focus_disabled)
XtRemoveTimeOut( focus_timerid);
......@@ -277,7 +277,7 @@ XHelp::~XHelp()
XtDestroyWidget( parent_wid);
}
XHelp::XHelp(
CoXHelp::CoXHelp(
Widget xa_parent_wid,
void *xa_parent_ctx,
xhelp_eUtility utility,
......@@ -371,7 +371,7 @@ XHelp::XHelp(
XtManageChild( toplevel);
xhelpnav = new XHelpNav( (void *)this, xhelpnav_form, title, utility, &brow_widget,
xhelpnav = new CoXHelpNav( (void *)this, xhelpnav_form, title, utility, &brow_widget,
&sts);
// XtPopup( parent_wid, XtGrabNone);
......
src/lib/co/src/co_xhelp.h
View file @ 9600a8df
......@@ -20,9 +20,9 @@ extern "C" {
# include "co_xhelpnav.h"
#endif
class XHelp {
class CoXHelp {
public:
XHelp(
CoXHelp(
Widget xa_parent_wid,
void *xa_parent_ctx,
xhelp_eUtility utility,
......@@ -33,7 +33,7 @@ class XHelp {
Widget brow_widget;
Widget form_widget;
Widget toplevel;
XHelpNav *xhelpnav;
CoXHelpNav *xhelpnav;
Widget xhelpnav_form;
void *client_data;
void (*close_cb) ( void *, void *);
......@@ -43,9 +43,9 @@ class XHelp {
Widget india_widget;
Widget india_label;
Widget india_text;
void (*india_ok_cb)( XHelp *, char *);
void (*india_ok_cb)( CoXHelp *, char *);
static XHelp *default_xhelp;
static CoXHelp *default_xhelp;
void pop();
void map();
......@@ -54,11 +54,11 @@ class XHelp {
char *file_name, bool strict);
int help_index( navh_eHelpFile file_type, char *file_name);
void set_dimension( int width, int height);
static void set_default( XHelp *xhelp) { default_xhelp = xhelp;}
static void set_default( CoXHelp *xhelp) { default_xhelp = xhelp;}
static int dhelp( char *key, char *help_bookmark, navh_eHelpFile file_type,
char *file_name, bool strict);
static int dhelp_index( navh_eHelpFile file_type, char *file_name);
~XHelp();
~CoXHelp();
};
......
src/lib/co/src/co_xhelpnav.cpp
View file @ 9600a8df
This diff is collapsed.
src/lib/co/src/co_xhelpnav.h
View file @ 9600a8df
......@@ -61,13 +61,13 @@ typedef enum {
xhelp_eUtility_Wtt
} xhelp_eUtility;
class XHelpNavBrow {
class CoXHelpNavBrow {
public:
XHelpNavBrow( BrowCtx *brow_ctx, void *brow_userdata) :
CoXHelpNavBrow( BrowCtx *brow_ctx, void *brow_userdata) :
ctx(brow_ctx), userdata(brow_userdata)
{}
#if 0
~XHelpNavBrow();
~CoXHelpNavBrow();
#endif
BrowCtx *ctx;
......@@ -86,16 +86,16 @@ class XHelpNavBrow {
void brow_setup();
};
class XHelpNav {
class CoXHelpNav {
public:
XHelpNav(
CoXHelpNav(
void *xn_parent_ctx,
Widget xn_parent_wid,
char *xn_name,
xhelp_eUtility xn_utility,
Widget *w,
pwr_tStatus *status);
~XHelpNav();
~CoXHelpNav();
void *parent_ctx;
Widget parent_wid;
......@@ -103,9 +103,9 @@ class XHelpNav {
Widget brow_widget;
Widget form_widget;
Widget toplevel;
XHelpNavBrow *brow;
XHelpNavBrow *collect_brow;
XHelpNavBrow *brow_stack[XHELPNAV_BROW_MAX];
CoXHelpNavBrow *brow;
CoXHelpNavBrow *collect_brow;
CoXHelpNavBrow *brow_stack[XHELPNAV_BROW_MAX];
int brow_cnt;
int closing_down;
int displayed;
......@@ -126,7 +126,7 @@ class XHelpNav {
int brow_push_all();
void set_inputfocus();
void pop();
void enable_events( XHelpNavBrow *brow);
void enable_events( CoXHelpNavBrow *brow);
int help( char *key, char *help_bookmark, navh_eHelpFile file_type,
char *file_name, int pop, bool strict);
int help_index( navh_eHelpFile file_type, char *file_name, int pop);
......@@ -142,7 +142,7 @@ class HItem {
type( xhelpnav_eHItemType_Object),
node(NULL)
{};
virtual int doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav,
virtual int doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav,
double x, double y) { return 1;}
virtual bool search( char *str, bool strict) { return false;}
xhelpnav_eHItemType type;
......@@ -151,23 +151,23 @@ class HItem {
class HItemHeader : public HItem {
public:
HItemHeader( XHelpNavBrow *brow, char *item_name, char *title,
HItemHeader( CoXHelpNavBrow *brow, char *item_name, char *title,
brow_tNode dest, flow_eDest dest_code);
};
class HItemHelpLine : public HItem {
public:
HItemHelpLine( XHelpNavBrow *brow, char *item_name,
HItemHelpLine( CoXHelpNavBrow *brow, char *item_name,
brow_tNode dest, flow_eDest dest_code);
};
class HItemHelpImage : public HItem {
public:
HItemHelpImage( XHelpNavBrow *brow, char *item_name, brow_tNodeClass nc,
HItemHelpImage( CoXHelpNavBrow *brow, char *item_name, brow_tNodeClass nc,
char *item_link, char *item_bookmark,
char *item_file_name, navh_eHelpFile help_file_type,
brow_tNode dest, flow_eDest dest_code);
int doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav,
int doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav,
double x, double y);
char link[200];
char bookmark[80];
......@@ -177,17 +177,17 @@ class HItemHelpImage : public HItem {
class HItemHeaderLarge : public HItem {
public:
HItemHeaderLarge( XHelpNavBrow *brow, char *item_name, char *title,
HItemHeaderLarge( CoXHelpNavBrow *brow, char *item_name, char *title,
brow_tNode dest, flow_eDest dest_code);
bool search( char *str, bool strict);
};
class HItemHelp : public HItem {
public:
HItemHelp( XHelpNavBrow *brow, char *item_name, char *text, char *text2,
HItemHelp( CoXHelpNavBrow *brow, char *item_name, char *text, char *text2,
char *text3, char *item_link, char *item_bookmark,
char *item_file_name, navh_eHelpFile help_file_type, int help_index, brow_tNode dest, flow_eDest dest_code);
int doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav,
int doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav,
double x, double y);
bool search( char *str, bool strict);
char link[200];
......@@ -199,11 +199,11 @@ class HItemHelp : public HItem {
class HItemHelpBold : public HItem {
public:
HItemHelpBold( XHelpNavBrow *brow, char *item_name, char *text, char *text2,
HItemHelpBold( CoXHelpNavBrow *brow, char *item_name, char *text, char *text2,
char *text3, char *item_link, char *item_bookmark,
char *item_file_name, navh_eHelpFile help_file_type, int help_index,
brow_tNode dest, flow_eDest dest_code);
int doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav,
int doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav,
double x, double y);
bool search( char *str, bool strict);
char link[200];
......@@ -215,9 +215,9 @@ class HItemHelpBold : public HItem {
class HItemHelpHeader : public HItem {
public:
HItemHelpHeader( XHelpNavBrow *brow, char *item_name, char *title, bool base,
HItemHelpHeader( CoXHelpNavBrow *brow, char *item_name, char *title, bool base,
brow_tNode dest, flow_eDest dest_code);
int doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, double x, double y);
int doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav, double x, double y);
bool search( char *str, bool strict);
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7