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
Show 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" { ...@@ -43,13 +43,13 @@ extern "C" {
#include "co_xhelpnav.h" #include "co_xhelpnav.h"
#include "co_xhelp.h" #include "co_xhelp.h"
XHelp *XHelp::default_xhelp = 0; CoXHelp *CoXHelp::default_xhelp = 0;
// Prototype declarations // 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, char *init_text,
void (*ok_cb)( XHelp *, char *)) void (*ok_cb)( CoXHelp *, char *))
{ {
Arg args[10]; Arg args[10];
int i; int i;
...@@ -75,12 +75,12 @@ static void xhelp_open_input_dialog( XHelp *xhelp, char *text, char *title, ...@@ -75,12 +75,12 @@ static void xhelp_open_input_dialog( XHelp *xhelp, char *text, char *title,
xhelp->india_ok_cb = ok_cb; 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); 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) if ( xhelp->close_cb)
(xhelp->close_cb)( xhelp->parent_ctx, (void *)xhelp); (xhelp->close_cb)( xhelp->parent_ctx, (void *)xhelp);
...@@ -91,7 +91,7 @@ static void xhelp_activate_exit( Widget w, XHelp *xhelp, XmAnyCallbackStruct *da ...@@ -91,7 +91,7 @@ static void xhelp_activate_exit( Widget w, XHelp *xhelp, XmAnyCallbackStruct *da
// delete xhelp; // 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; double zoom_factor;
...@@ -102,7 +102,7 @@ static void xhelp_activate_zoom_in( Widget w, XHelp *xhelp, XmAnyCallbackStruct ...@@ -102,7 +102,7 @@ static void xhelp_activate_zoom_in( Widget w, XHelp *xhelp, XmAnyCallbackStruct
xhelp->xhelpnav->zoom( 1.18); 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; double zoom_factor;
...@@ -113,36 +113,36 @@ static void xhelp_activate_zoom_out( Widget w, XHelp *xhelp, XmAnyCallbackStruct ...@@ -113,36 +113,36 @@ static void xhelp_activate_zoom_out( Widget w, XHelp *xhelp, XmAnyCallbackStruct
xhelp->xhelpnav->zoom( 1.0 / 1.18); 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(); 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_open_input_dialog( xhelp, "Search string", "Search string",
"", &xhelp_find_ok); "", &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(); 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(); 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; 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; 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; char *value;
...@@ -151,27 +151,27 @@ static void xhelp_activate_india_ok( Widget w, XHelp *xhelp, XmAnyCallbackStruct ...@@ -151,27 +151,27 @@ static void xhelp_activate_india_ok( Widget w, XHelp *xhelp, XmAnyCallbackStruct
(xhelp->india_ok_cb)( xhelp, value); (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); 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; xhelp->xhelpnav_form = w;
} }
static void xhelp_enable_set_focus( XHelp *xhelp) static void xhelp_enable_set_focus( CoXHelp *xhelp)
{ {
xhelp->set_focus_disabled--; 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->set_focus_disabled++;
xhelp->focus_timerid = XtAppAddTimeOut( xhelp->focus_timerid = XtAppAddTimeOut(
...@@ -182,7 +182,7 @@ static void xhelp_disable_set_focus( XHelp *xhelp, int time) ...@@ -182,7 +182,7 @@ static void xhelp_disable_set_focus( XHelp *xhelp, int time)
static void xhelp_action_inputfocus( Widget w, XmAnyCallbackStruct *data) static void xhelp_action_inputfocus( Widget w, XmAnyCallbackStruct *data)
{ {
Arg args[1]; Arg args[1];
XHelp *xhelp; CoXHelp *xhelp;
XtSetArg (args[0], XmNuserData, &xhelp); XtSetArg (args[0], XmNuserData, &xhelp);
XtGetValues (w, args, 1); XtGetValues (w, args, 1);
...@@ -204,19 +204,19 @@ static void xhelp_action_inputfocus( Widget w, XmAnyCallbackStruct *data) ...@@ -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; displayed = 1;
} }
void XHelp::clear() void CoXHelp::clear()
{ {
xhelpnav->brow_push_all(); xhelpnav->brow_push_all();
xhelpnav->clear(); 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) char *file_name, bool strict)
{ {
return xhelpnav->help( key, help_bookmark, file_type, return xhelpnav->help( key, help_bookmark, file_type,
...@@ -226,7 +226,7 @@ int XHelp::help( char *key, char *help_bookmark, navh_eHelpFile 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 // 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) char *file_name, bool strict)
{ {
if ( !default_xhelp) if ( !default_xhelp)
...@@ -239,12 +239,12 @@ int XHelp::dhelp( char *key, char *help_bookmark, navh_eHelpFile file_type, ...@@ -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); 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) if ( !default_xhelp)
return 0; return 0;
...@@ -254,7 +254,7 @@ int XHelp::dhelp_index( navh_eHelpFile file_type, char *file_name) ...@@ -254,7 +254,7 @@ int XHelp::dhelp_index( navh_eHelpFile file_type, char *file_name)
return default_xhelp->help_index( file_type, 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]; Arg args[3];
...@@ -268,7 +268,7 @@ void XHelp::set_dimension( int width, int height) ...@@ -268,7 +268,7 @@ void XHelp::set_dimension( int width, int height)
XtSetValues( toplevel, args,i); XtSetValues( toplevel, args,i);
} }
XHelp::~XHelp() CoXHelp::~CoXHelp()
{ {
if ( set_focus_disabled) if ( set_focus_disabled)
XtRemoveTimeOut( focus_timerid); XtRemoveTimeOut( focus_timerid);
...@@ -277,7 +277,7 @@ XHelp::~XHelp() ...@@ -277,7 +277,7 @@ XHelp::~XHelp()
XtDestroyWidget( parent_wid); XtDestroyWidget( parent_wid);
} }
XHelp::XHelp( CoXHelp::CoXHelp(
Widget xa_parent_wid, Widget xa_parent_wid,
void *xa_parent_ctx, void *xa_parent_ctx,
xhelp_eUtility utility, xhelp_eUtility utility,
...@@ -371,7 +371,7 @@ XHelp::XHelp( ...@@ -371,7 +371,7 @@ XHelp::XHelp(
XtManageChild( toplevel); 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); &sts);
// XtPopup( parent_wid, XtGrabNone); // XtPopup( parent_wid, XtGrabNone);
......
src/lib/co/src/co_xhelp.h
View file @ 9600a8df
...@@ -20,9 +20,9 @@ extern "C" { ...@@ -20,9 +20,9 @@ extern "C" {
# include "co_xhelpnav.h" # include "co_xhelpnav.h"
#endif #endif
class XHelp { class CoXHelp {
public: public:
XHelp( CoXHelp(
Widget xa_parent_wid, Widget xa_parent_wid,
void *xa_parent_ctx, void *xa_parent_ctx,
xhelp_eUtility utility, xhelp_eUtility utility,
...@@ -33,7 +33,7 @@ class XHelp { ...@@ -33,7 +33,7 @@ class XHelp {
Widget brow_widget; Widget brow_widget;
Widget form_widget; Widget form_widget;
Widget toplevel; Widget toplevel;
XHelpNav *xhelpnav; CoXHelpNav *xhelpnav;
Widget xhelpnav_form; Widget xhelpnav_form;
void *client_data; void *client_data;
void (*close_cb) ( void *, void *); void (*close_cb) ( void *, void *);
...@@ -43,9 +43,9 @@ class XHelp { ...@@ -43,9 +43,9 @@ class XHelp {
Widget india_widget; Widget india_widget;
Widget india_label; Widget india_label;
Widget india_text; 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 pop();
void map(); void map();
...@@ -54,11 +54,11 @@ class XHelp { ...@@ -54,11 +54,11 @@ class XHelp {
char *file_name, bool strict); char *file_name, bool strict);
int help_index( navh_eHelpFile file_type, char *file_name); int help_index( navh_eHelpFile file_type, char *file_name);
void set_dimension( int width, int height); 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, static int dhelp( char *key, char *help_bookmark, navh_eHelpFile file_type,
char *file_name, bool strict); char *file_name, bool strict);
static int dhelp_index( navh_eHelpFile file_type, char *file_name); static int dhelp_index( navh_eHelpFile file_type, char *file_name);
~XHelp(); ~CoXHelp();
}; };
......
src/lib/co/src/co_xhelpnav.cpp
View file @ 9600a8df
...@@ -71,7 +71,7 @@ static void xhelpnav_open_URL( char *link) ...@@ -71,7 +71,7 @@ static void xhelpnav_open_URL( char *link)
// //
// Free pixmaps // Free pixmaps
// //
void XHelpNavBrow::free_pixmaps() void CoXHelpNavBrow::free_pixmaps()
{ {
brow_FreeAnnotPixmap( ctx, pixmap_morehelp); brow_FreeAnnotPixmap( ctx, pixmap_morehelp);
brow_FreeAnnotPixmap( ctx, pixmap_closehelp); brow_FreeAnnotPixmap( ctx, pixmap_closehelp);
...@@ -80,7 +80,7 @@ void XHelpNavBrow::free_pixmaps() ...@@ -80,7 +80,7 @@ void XHelpNavBrow::free_pixmaps()
// //
// Create pixmaps for leaf, closed map and open map // Create pixmaps for leaf, closed map and open map
// //
void XHelpNavBrow::allocate_pixmaps() void CoXHelpNavBrow::allocate_pixmaps()
{ {
flow_sPixmapData pixmap_data; flow_sPixmapData pixmap_data;
int i; int i;
...@@ -151,7 +151,7 @@ void XHelpNavBrow::allocate_pixmaps() ...@@ -151,7 +151,7 @@ void XHelpNavBrow::allocate_pixmaps()
// //
// Create nodeclasses // Create nodeclasses
// //
void XHelpNavBrow::create_nodeclasses() void CoXHelpNavBrow::create_nodeclasses()
{ {
allocate_pixmaps(); allocate_pixmaps();
...@@ -224,7 +224,7 @@ void XHelpNavBrow::create_nodeclasses() ...@@ -224,7 +224,7 @@ void XHelpNavBrow::create_nodeclasses()
} }
void XHelpNavBrow::brow_setup() void CoXHelpNavBrow::brow_setup()
{ {
brow_sAttributes brow_attr; brow_sAttributes brow_attr;
unsigned long mask; unsigned long mask;
...@@ -236,10 +236,11 @@ void XHelpNavBrow::brow_setup() ...@@ -236,10 +236,11 @@ void XHelpNavBrow::brow_setup()
brow_attr.annotation_space = 0.5; brow_attr.annotation_space = 0.5;
brow_SetAttributes( ctx, &brow_attr, mask); brow_SetAttributes( ctx, &brow_attr, mask);
brow_SetCtxUserData( ctx, userdata); brow_SetCtxUserData( ctx, userdata);
brow_SetWhiteBackground( ctx);
} }
void XHelpNav::clear() void CoXHelpNav::clear()
{ {
brow_DeleteAll( brow->ctx); brow_DeleteAll( brow->ctx);
} }
...@@ -250,11 +251,11 @@ void XHelpNav::clear() ...@@ -250,11 +251,11 @@ void XHelpNav::clear()
// //
static Boolean set_displayed( void *xhelpnav) static Boolean set_displayed( void *xhelpnav)
{ {
((XHelpNav *)xhelpnav)->displayed = 1; ((CoXHelpNav *)xhelpnav)->displayed = 1;
return True; return True;
} }
void XHelpNav::pop() void CoXHelpNav::pop()
{ {
Widget parent, top; Widget parent, top;
...@@ -278,7 +279,7 @@ void XHelpNav::pop() ...@@ -278,7 +279,7 @@ void XHelpNav::pop()
// //
// Create the navigator widget // Create the navigator widget
// //
XHelpNav::XHelpNav( CoXHelpNav::CoXHelpNav(
void *xn_parent_ctx, void *xn_parent_ctx,
Widget xn_parent_wid, Widget xn_parent_wid,
char *xn_name, char *xn_name,
...@@ -304,7 +305,7 @@ XHelpNav::XHelpNav( ...@@ -304,7 +305,7 @@ XHelpNav::XHelpNav(
// //
// Delete a nav context // Delete a nav context
// //
XHelpNav::~XHelpNav() CoXHelpNav::~CoXHelpNav()
{ {
closing_down = 1; closing_down = 1;
...@@ -320,7 +321,7 @@ XHelpNav::~XHelpNav() ...@@ -320,7 +321,7 @@ XHelpNav::~XHelpNav()
// //
// Print // Print
// //
void XHelpNav::print( char *filename) void CoXHelpNav::print( char *filename)
{ {
brow_Print( brow->ctx, filename); brow_Print( brow->ctx, filename);
} }
...@@ -329,7 +330,7 @@ void XHelpNav::print( char *filename) ...@@ -329,7 +330,7 @@ void XHelpNav::print( char *filename)
// //
// Zoom // Zoom
// //
void XHelpNav::zoom( double zoom_factor) void CoXHelpNav::zoom( double zoom_factor)
{ {
brow_Zoom( brow->ctx, zoom_factor); brow_Zoom( brow->ctx, zoom_factor);
} }
...@@ -337,7 +338,7 @@ void XHelpNav::zoom( double zoom_factor) ...@@ -337,7 +338,7 @@ void XHelpNav::zoom( double zoom_factor)
// //
// Return to base zoom factor // Return to base zoom factor
// //
void XHelpNav::unzoom() void CoXHelpNav::unzoom()
{ {
brow_UnZoom( brow->ctx); brow_UnZoom( brow->ctx);
} }
...@@ -345,12 +346,12 @@ void XHelpNav::unzoom() ...@@ -345,12 +346,12 @@ void XHelpNav::unzoom()
// //
// Get zoom // Get zoom
// //
void XHelpNav::get_zoom( double *zoom_factor) void CoXHelpNav::get_zoom( double *zoom_factor)
{ {
brow_GetZoom( brow->ctx, zoom_factor); brow_GetZoom( brow->ctx, zoom_factor);
} }
void XHelpNav::set_inputfocus() void CoXHelpNav::set_inputfocus()
{ {
if ( displayed && flow_IsViewable( brow_widget)) { if ( displayed && flow_IsViewable( brow_widget)) {
XtCallAcceptFocus( brow_widget, CurrentTime); XtCallAcceptFocus( brow_widget, CurrentTime);
...@@ -362,7 +363,7 @@ void XHelpNav::set_inputfocus() ...@@ -362,7 +363,7 @@ void XHelpNav::set_inputfocus()
// //
static int xhelpnav_brow_cb( FlowCtx *ctx, flow_tEvent event) static int xhelpnav_brow_cb( FlowCtx *ctx, flow_tEvent event)
{ {
XHelpNav *xhelpnav; CoXHelpNav *xhelpnav;
HItem *item; HItem *item;
brow_GetCtxUserData( (BrowCtx *)ctx, (void **) &xhelpnav); brow_GetCtxUserData( (BrowCtx *)ctx, (void **) &xhelpnav);
...@@ -555,7 +556,7 @@ static int xhelpnav_brow_cb( FlowCtx *ctx, flow_tEvent event) ...@@ -555,7 +556,7 @@ static int xhelpnav_brow_cb( FlowCtx *ctx, flow_tEvent event)
return 1; return 1;
} }
int XHelpNav::brow_pop() int CoXHelpNav::brow_pop()
{ {
BrowCtx *secondary_ctx; BrowCtx *secondary_ctx;
...@@ -570,7 +571,7 @@ int XHelpNav::brow_pop() ...@@ -570,7 +571,7 @@ int XHelpNav::brow_pop()
return 1; return 1;
} }
int XHelpNav::brow_push() int CoXHelpNav::brow_push()
{ {
if ( brow_cnt == 1) if ( brow_cnt == 1)
return 0; return 0;
...@@ -584,14 +585,14 @@ int XHelpNav::brow_push() ...@@ -584,14 +585,14 @@ int XHelpNav::brow_push()
return 1; return 1;
} }
int XHelpNav::brow_push_all() int CoXHelpNav::brow_push_all()
{ {
while( brow_push()) while( brow_push())
; ;
return 1; return 1;
} }
void XHelpNav::enable_events( XHelpNavBrow *brow) void CoXHelpNav::enable_events( CoXHelpNavBrow *brow)
{ {
brow_EnableEvent( brow->ctx, flow_eEvent_MB1DoubleClickShift, flow_eEventType_CallBack, brow_EnableEvent( brow->ctx, flow_eEvent_MB1DoubleClickShift, flow_eEventType_CallBack,
xhelpnav_brow_cb); xhelpnav_brow_cb);
...@@ -645,11 +646,11 @@ void XHelpNav::enable_events( XHelpNavBrow *brow) ...@@ -645,11 +646,11 @@ void XHelpNav::enable_events( XHelpNavBrow *brow)
// //
static int xhelpnav_init_brow_base_cb( FlowCtx *fctx, void *client_data) static int xhelpnav_init_brow_base_cb( FlowCtx *fctx, void *client_data)
{ {
XHelpNav *xhelpnav = (XHelpNav *) client_data; CoXHelpNav *xhelpnav = (CoXHelpNav *) client_data;
BrowCtx *ctx = (BrowCtx *)fctx; BrowCtx *ctx = (BrowCtx *)fctx;
xhelpnav->brow = new XHelpNavBrow( ctx, (void *)xhelpnav); xhelpnav->brow = new CoXHelpNavBrow( ctx, (void *)xhelpnav);
xhelpnav->brow_stack[0] = new XHelpNavBrow( ctx, (void *)xhelpnav); xhelpnav->brow_stack[0] = new CoXHelpNavBrow( ctx, (void *)xhelpnav);
xhelpnav->brow_cnt++; xhelpnav->brow_cnt++;
xhelpnav->brow->brow_setup(); xhelpnav->brow->brow_setup();
...@@ -663,9 +664,9 @@ static int xhelpnav_init_brow_base_cb( FlowCtx *fctx, void *client_data) ...@@ -663,9 +664,9 @@ static int xhelpnav_init_brow_base_cb( FlowCtx *fctx, void *client_data)
static int xhelpnav_init_brow_cb( BrowCtx *ctx, void *client_data) static int xhelpnav_init_brow_cb( BrowCtx *ctx, void *client_data)
{ {
XHelpNav *xhelpnav = (XHelpNav *) client_data; CoXHelpNav *xhelpnav = (CoXHelpNav *) client_data;
xhelpnav->brow_stack[xhelpnav->brow_cnt] = new XHelpNavBrow( ctx, (void *)xhelpnav); xhelpnav->brow_stack[xhelpnav->brow_cnt] = new CoXHelpNavBrow( ctx, (void *)xhelpnav);
xhelpnav->brow_stack[xhelpnav->brow_cnt]->brow_setup(); xhelpnav->brow_stack[xhelpnav->brow_cnt]->brow_setup();
xhelpnav->brow_stack[xhelpnav->brow_cnt]->create_nodeclasses(); xhelpnav->brow_stack[xhelpnav->brow_cnt]->create_nodeclasses();
...@@ -674,7 +675,7 @@ static int xhelpnav_init_brow_cb( BrowCtx *ctx, void *client_data) ...@@ -674,7 +675,7 @@ static int xhelpnav_init_brow_cb( BrowCtx *ctx, void *client_data)
return 1; return 1;
} }
pwr_tStatus XHelpNav::search( char *str, bool strict) pwr_tStatus CoXHelpNav::search( char *str, bool strict)
{ {
search_node = 0; search_node = 0;
search_strict = strict; search_strict = strict;
...@@ -690,7 +691,7 @@ pwr_tStatus XHelpNav::search( char *str, bool strict) ...@@ -690,7 +691,7 @@ pwr_tStatus XHelpNav::search( char *str, bool strict)
#define XHELP__SUCCESS 1; #define XHELP__SUCCESS 1;
#define XHELP__SEARCHNOTFOUND 4; #define XHELP__SEARCHNOTFOUND 4;
pwr_tStatus XHelpNav::search_next() pwr_tStatus CoXHelpNav::search_next()
{ {
if ( strcmp( search_str, "") == 0) if ( strcmp( search_str, "") == 0)
return XHELP__SEARCHNOTSTARTED; return XHELP__SEARCHNOTSTARTED;
...@@ -698,7 +699,7 @@ pwr_tStatus XHelpNav::search_next() ...@@ -698,7 +699,7 @@ pwr_tStatus XHelpNav::search_next()
return search_exec( false); return search_exec( false);
} }
pwr_tStatus XHelpNav::search_next_reverse() pwr_tStatus CoXHelpNav::search_next_reverse()
{ {
if ( strcmp( search_str, "") == 0) if ( strcmp( search_str, "") == 0)
return XHELP__SEARCHNOTSTARTED; return XHELP__SEARCHNOTSTARTED;
...@@ -706,7 +707,7 @@ pwr_tStatus XHelpNav::search_next_reverse() ...@@ -706,7 +707,7 @@ pwr_tStatus XHelpNav::search_next_reverse()
return search_exec( true); return search_exec( true);
} }
pwr_tStatus XHelpNav::search_exec( bool reverse) pwr_tStatus CoXHelpNav::search_exec( bool reverse)
{ {
brow_tObject *object_list; brow_tObject *object_list;
int object_cnt; int object_cnt;
...@@ -748,7 +749,7 @@ pwr_tStatus XHelpNav::search_exec( bool reverse) ...@@ -748,7 +749,7 @@ pwr_tStatus XHelpNav::search_exec( bool reverse)
return XHELP__SEARCHNOTFOUND; return XHELP__SEARCHNOTFOUND;
} }
HItemHeader::HItemHeader( XHelpNavBrow *brow, char *item_name, char *title, HItemHeader::HItemHeader( CoXHelpNavBrow *brow, char *item_name, char *title,
brow_tNode dest, flow_eDest dest_code) brow_tNode dest, flow_eDest dest_code)
{ {
type = xhelpnav_eHItemType_Header; type = xhelpnav_eHItemType_Header;
...@@ -757,7 +758,7 @@ HItemHeader::HItemHeader( XHelpNavBrow *brow, char *item_name, char *title, ...@@ -757,7 +758,7 @@ HItemHeader::HItemHeader( XHelpNavBrow *brow, char *item_name, char *title,
brow_SetAnnotation( node, 0, title, strlen(title)); brow_SetAnnotation( node, 0, title, strlen(title));
} }
HItemHelpLine::HItemHelpLine( XHelpNavBrow *brow, char *item_name, HItemHelpLine::HItemHelpLine( CoXHelpNavBrow *brow, char *item_name,
brow_tNode dest, flow_eDest dest_code) brow_tNode dest, flow_eDest dest_code)
{ {
type = xhelpnav_eHItemType_HelpLine; type = xhelpnav_eHItemType_HelpLine;
...@@ -765,7 +766,7 @@ HItemHelpLine::HItemHelpLine( XHelpNavBrow *brow, char *item_name, ...@@ -765,7 +766,7 @@ HItemHelpLine::HItemHelpLine( XHelpNavBrow *brow, char *item_name,
dest, dest_code, (void *)this, 1, &node); dest, dest_code, (void *)this, 1, &node);
} }
HItemHelpImage::HItemHelpImage( XHelpNavBrow *brow, char *item_name, brow_tNodeClass nc, HItemHelpImage::HItemHelpImage( CoXHelpNavBrow *brow, char *item_name, brow_tNodeClass nc,
char *item_link, char *item_bookmark, char *item_link, char *item_bookmark,
char *item_file_name, navh_eHelpFile help_file_type, char *item_file_name, navh_eHelpFile help_file_type,
brow_tNode dest, flow_eDest dest_code) brow_tNode dest, flow_eDest dest_code)
...@@ -785,7 +786,7 @@ HItemHelpImage::HItemHelpImage( XHelpNavBrow *brow, char *item_name, brow_tNodeC ...@@ -785,7 +786,7 @@ HItemHelpImage::HItemHelpImage( XHelpNavBrow *brow, char *item_name, brow_tNodeC
brow_SetAnnotPixmap( node, 0, brow->pixmap_morehelp); brow_SetAnnotPixmap( node, 0, brow->pixmap_morehelp);
} }
int HItemHelpImage::doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, double x, double y) int HItemHelpImage::doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav, double x, double y)
{ {
int sts; int sts;
...@@ -809,7 +810,7 @@ int HItemHelpImage::doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, ...@@ -809,7 +810,7 @@ int HItemHelpImage::doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav,
return 1; return 1;
} }
HItemHeaderLarge::HItemHeaderLarge( XHelpNavBrow *brow, char *item_name, char *title, HItemHeaderLarge::HItemHeaderLarge( CoXHelpNavBrow *brow, char *item_name, char *title,
brow_tNode dest, flow_eDest dest_code) brow_tNode dest, flow_eDest dest_code)
{ {
type = xhelpnav_eHItemType_HeaderLarge; type = xhelpnav_eHItemType_HeaderLarge;
...@@ -832,7 +833,7 @@ bool HItemHeaderLarge::search( char *str, bool strict) ...@@ -832,7 +833,7 @@ bool HItemHeaderLarge::search( char *str, bool strict)
return false; return false;
} }
HItemHelpHeader::HItemHelpHeader( XHelpNavBrow *brow, char *item_name, char *title, bool base, HItemHelpHeader::HItemHelpHeader( CoXHelpNavBrow *brow, char *item_name, char *title, bool base,
brow_tNode dest, flow_eDest dest_code) brow_tNode dest, flow_eDest dest_code)
{ {
type = xhelpnav_eHItemType_HelpHeader; type = xhelpnav_eHItemType_HelpHeader;
...@@ -857,14 +858,14 @@ bool HItemHelpHeader::search( char *str, bool strict) ...@@ -857,14 +858,14 @@ bool HItemHelpHeader::search( char *str, bool strict)
return false; return false;
} }
int HItemHelpHeader::doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, double x, double y) int HItemHelpHeader::doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav, double x, double y)
{ {
if ( xhelpnav) if ( xhelpnav)
xhelpnav->brow_push(); xhelpnav->brow_push();
return 1; return 1;
} }
HItemHelp::HItemHelp( XHelpNavBrow *brow, char *item_name, char *text, char *text2, HItemHelp::HItemHelp( CoXHelpNavBrow *brow, char *item_name, char *text, char *text2,
char *text3, char *item_link, char *item_bookmark, 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) : char *item_file_name, navh_eHelpFile help_file_type, int help_index, brow_tNode dest, flow_eDest dest_code) :
file_type(help_file_type), index(help_index) file_type(help_file_type), index(help_index)
...@@ -903,7 +904,7 @@ bool HItemHelp::search( char *str, bool strict) ...@@ -903,7 +904,7 @@ bool HItemHelp::search( char *str, bool strict)
return false; return false;
} }
int HItemHelp::doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, double x, double y) int HItemHelp::doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav, double x, double y)
{ {
int sts; int sts;
...@@ -931,7 +932,7 @@ int HItemHelp::doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, doubl ...@@ -931,7 +932,7 @@ int HItemHelp::doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, doubl
return 1; return 1;
} }
HItemHelpBold::HItemHelpBold( XHelpNavBrow *brow, char *item_name, char *text, char *text2, HItemHelpBold::HItemHelpBold( CoXHelpNavBrow *brow, char *item_name, char *text, char *text2,
char *text3, char *item_link, char *item_bookmark, 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) : char *item_file_name, navh_eHelpFile help_file_type, int help_index, brow_tNode dest, flow_eDest dest_code) :
file_type(help_file_type), index(help_index) file_type(help_file_type), index(help_index)
...@@ -970,7 +971,7 @@ bool HItemHelpBold::search( char *str, bool strict) ...@@ -970,7 +971,7 @@ bool HItemHelpBold::search( char *str, bool strict)
return false; return false;
} }
int HItemHelpBold::doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, double x, double y) int HItemHelpBold::doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav, double x, double y)
{ {
int sts; int sts;
...@@ -1010,7 +1011,7 @@ void *xhelpnav_help_insert_cb( void *ctx, navh_eItemType item_type, char *text1, ...@@ -1010,7 +1011,7 @@ void *xhelpnav_help_insert_cb( void *ctx, navh_eItemType item_type, char *text1,
char *bookmark, char *file_name, char *bookmark, char *file_name,
navh_eHelpFile file_type, int help_index, char *bm) navh_eHelpFile file_type, int help_index, char *bm)
{ {
XHelpNav *xhelpnav = (XHelpNav *)ctx; CoXHelpNav *xhelpnav = (CoXHelpNav *)ctx;
if ( xhelpnav->init_help) { if ( xhelpnav->init_help) {
xhelpnav->brow_pop(); xhelpnav->brow_pop();
...@@ -1074,7 +1075,7 @@ void *xhelpnav_help_insert_cb( void *ctx, navh_eItemType item_type, char *text1, ...@@ -1074,7 +1075,7 @@ void *xhelpnav_help_insert_cb( void *ctx, navh_eItemType item_type, char *text1,
} }
} }
int XHelpNav::help( char *help_key, char *help_bookmark, int CoXHelpNav::help( char *help_key, char *help_bookmark,
navh_eHelpFile file_type, char *file_name, int pop, bool strict) navh_eHelpFile file_type, char *file_name, int pop, bool strict)
{ {
int sts; int sts;
...@@ -1138,7 +1139,7 @@ int XHelpNav::help( char *help_key, char *help_bookmark, ...@@ -1138,7 +1139,7 @@ int XHelpNav::help( char *help_key, char *help_bookmark,
* *
**************************************************************************/ **************************************************************************/
int XHelpNav::help_index( navh_eHelpFile file_type, char *file_name, int pop) int CoXHelpNav::help_index( navh_eHelpFile file_type, char *file_name, int pop)
{ {
int sts; int sts;
brow_tObject *object_list; brow_tObject *object_list;
......
src/lib/co/src/co_xhelpnav.h
View file @ 9600a8df
...@@ -61,13 +61,13 @@ typedef enum { ...@@ -61,13 +61,13 @@ typedef enum {
xhelp_eUtility_Wtt xhelp_eUtility_Wtt
} xhelp_eUtility; } xhelp_eUtility;
class XHelpNavBrow { class CoXHelpNavBrow {
public: public:
XHelpNavBrow( BrowCtx *brow_ctx, void *brow_userdata) : CoXHelpNavBrow( BrowCtx *brow_ctx, void *brow_userdata) :
ctx(brow_ctx), userdata(brow_userdata) ctx(brow_ctx), userdata(brow_userdata)
{} {}
#if 0 #if 0
~XHelpNavBrow(); ~CoXHelpNavBrow();
#endif #endif
BrowCtx *ctx; BrowCtx *ctx;
...@@ -86,16 +86,16 @@ class XHelpNavBrow { ...@@ -86,16 +86,16 @@ class XHelpNavBrow {
void brow_setup(); void brow_setup();
}; };
class XHelpNav { class CoXHelpNav {
public: public:
XHelpNav( CoXHelpNav(
void *xn_parent_ctx, void *xn_parent_ctx,
Widget xn_parent_wid, Widget xn_parent_wid,
char *xn_name, char *xn_name,
xhelp_eUtility xn_utility, xhelp_eUtility xn_utility,
Widget *w, Widget *w,
pwr_tStatus *status); pwr_tStatus *status);
~XHelpNav(); ~CoXHelpNav();
void *parent_ctx; void *parent_ctx;
Widget parent_wid; Widget parent_wid;
...@@ -103,9 +103,9 @@ class XHelpNav { ...@@ -103,9 +103,9 @@ class XHelpNav {
Widget brow_widget; Widget brow_widget;
Widget form_widget; Widget form_widget;
Widget toplevel; Widget toplevel;
XHelpNavBrow *brow; CoXHelpNavBrow *brow;
XHelpNavBrow *collect_brow; CoXHelpNavBrow *collect_brow;
XHelpNavBrow *brow_stack[XHELPNAV_BROW_MAX]; CoXHelpNavBrow *brow_stack[XHELPNAV_BROW_MAX];
int brow_cnt; int brow_cnt;
int closing_down; int closing_down;
int displayed; int displayed;
...@@ -126,7 +126,7 @@ class XHelpNav { ...@@ -126,7 +126,7 @@ class XHelpNav {
int brow_push_all(); int brow_push_all();
void set_inputfocus(); void set_inputfocus();
void pop(); void pop();
void enable_events( XHelpNavBrow *brow); void enable_events( CoXHelpNavBrow *brow);
int help( char *key, char *help_bookmark, navh_eHelpFile file_type, int help( char *key, char *help_bookmark, navh_eHelpFile file_type,
char *file_name, int pop, bool strict); char *file_name, int pop, bool strict);
int help_index( navh_eHelpFile file_type, char *file_name, int pop); int help_index( navh_eHelpFile file_type, char *file_name, int pop);
...@@ -142,7 +142,7 @@ class HItem { ...@@ -142,7 +142,7 @@ class HItem {
type( xhelpnav_eHItemType_Object), type( xhelpnav_eHItemType_Object),
node(NULL) node(NULL)
{}; {};
virtual int doubleclick_action( XHelpNavBrow *brow, XHelpNav *xhelpnav, virtual int doubleclick_action( CoXHelpNavBrow *brow, CoXHelpNav *xhelpnav,
double x, double y) { return 1;} double x, double y) { return 1;}
virtual bool search( char *str, bool strict) { return false;} virtual bool search( char *str, bool strict) { return false;}
xhelpnav_eHItemType type; xhelpnav_eHItemType type;
...@@ -151,23 +151,23 @@ class HItem { ...@@ -151,23 +151,23 @@ class HItem {
class HItemHeader : public HItem { class HItemHeader : public HItem {
public: public:
HItemHeader( XHelpNavBrow *brow, char *item_name, char *title, HItemHeader( CoXHelpNavBrow *brow, char *item_name, char *title,
brow_tNode dest, flow_eDest dest_code); brow_tNode dest, flow_eDest dest_code);
}; };
class HItemHelpLine : public HItem { class HItemHelpLine : public HItem {
public: public:
HItemHelpLine( XHelpNavBrow *brow, char *item_name, HItemHelpLine( CoXHelpNavBrow *brow, char *item_name,
brow_tNode dest, flow_eDest dest_code); brow_tNode dest, flow_eDest dest_code);
}; };
class HItemHelpImage : public HItem { class HItemHelpImage : public HItem {
public: 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_link, char *item_bookmark,
char *item_file_name, navh_eHelpFile help_file_type, char *item_file_name, navh_eHelpFile help_file_type,
brow_tNode dest, flow_eDest dest_code); 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); double x, double y);
char link[200]; char link[200];
char bookmark[80]; char bookmark[80];
...@@ -177,17 +177,17 @@ class HItemHelpImage : public HItem { ...@@ -177,17 +177,17 @@ class HItemHelpImage : public HItem {
class HItemHeaderLarge : public HItem { class HItemHeaderLarge : public HItem {
public: public:
HItemHeaderLarge( XHelpNavBrow *brow, char *item_name, char *title, HItemHeaderLarge( CoXHelpNavBrow *brow, char *item_name, char *title,
brow_tNode dest, flow_eDest dest_code); brow_tNode dest, flow_eDest dest_code);
bool search( char *str, bool strict); bool search( char *str, bool strict);
}; };
class HItemHelp : public HItem { class HItemHelp : public HItem {
public: 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 *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); 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); double x, double y);
bool search( char *str, bool strict); bool search( char *str, bool strict);
char link[200]; char link[200];
...@@ -199,11 +199,11 @@ class HItemHelp : public HItem { ...@@ -199,11 +199,11 @@ class HItemHelp : public HItem {
class HItemHelpBold : public HItem { class HItemHelpBold : public HItem {
public: 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 *text3, char *item_link, char *item_bookmark,
char *item_file_name, navh_eHelpFile help_file_type, int help_index, char *item_file_name, navh_eHelpFile help_file_type, int help_index,
brow_tNode dest, flow_eDest dest_code); 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); double x, double y);
bool search( char *str, bool strict); bool search( char *str, bool strict);
char link[200]; char link[200];
...@@ -215,9 +215,9 @@ class HItemHelpBold : public HItem { ...@@ -215,9 +215,9 @@ class HItemHelpBold : public HItem {
class HItemHelpHeader : public HItem { class HItemHelpHeader : public HItem {
public: 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); 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); 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