New configuration of operator window, and new menu

xtt/exe/rt_xtt/gtk/rt_xtt_gtk.cpp

@@ -555,8 +555,6 @@ int main(  int argc, char *argv[])
 {
   int sts;
 
-  gtk_init( &argc, &argv);
-
   setlocale( LC_TIME, "en_US");
 
   new XttGtk( argc, argv, &sts);
@@ -585,7 +583,7 @@ static void destroy_event( GtkWidget *w, gpointer data)
 }
 
 XttGtk::XttGtk( int argc, char *argv[], int *return_sts) :
-  Xtt( argc, argv, return_sts)
+  Xtt( &argc, &argv, return_sts)
 {
   const int	window_width = 400;
   const int    	window_height = 700;
@@ -594,6 +592,8 @@ XttGtk::XttGtk( int argc, char *argv[], int *return_sts) :
   char		title[120] = "Xtt ";
   char		nodename[80];
 
+  gtk_init( &argc, &argv);
+
   syi_NodeName( &sts, nodename, sizeof(nodename));
   if ( ODD(sts))
     strcat( title, nodename);

xtt/exe/rt_xtt/src/rt_xtt_main.h

@@ -67,7 +67,7 @@ class Xtt {
     int		op_close_button;
     int		no_advanceduser;
 
-    Xtt( int argc, char *argv[], int *return_sts);
+    Xtt( int *argc, char **argv[], int *return_sts);
     virtual ~Xtt() {}
     virtual void message( char severity, const char *msg) {}
     virtual void open_input_dialog( const char *text, const char *title,

xtt/exe/rt_xtt/src/xtt_main.cpp

@@ -34,6 +34,7 @@
 #include "co_time.h"
 #include "co_dcli.h"
 #include "co_lng.h"
+#include "co_syi.h"
 #include "flow.h"
 #include "flow_browctx.h"
 #include "flow_browapi.h"
@@ -453,15 +454,18 @@ void Xtt::activate_help_proview()
   CoXHelp::dhelp( "version", "", navh_eHelpFile_Other, "$pwr_exe/xtt_version_help.dat", 0);
 }
 
-Xtt::Xtt( int argc, char *argv[], int *return_sts) :
+Xtt::Xtt( int *argc, char **argv[], int *return_sts) :
   root_item(0), input_open(0), command_open(0), india_ok_cb(0), queid(qcom_cNQid), quiet(0), attach_audio(0), select_opplace(0), op_close_button(0), no_advanceduser(0)
 {
   pwr_tStatus	sts;
   int		i;
-  int	opplace_found = 0;
-  pwr_tObjid op_objid;
-  qcom_sQattr qAttr;
-  qcom_sQid qini;
+  int		opplace_found = 0;
+  pwr_tObjid 	op_objid;
+  qcom_sQattr 	qAttr;
+  qcom_sQid 	qini;
+  char		language[20] = "";
+  static char 	display[80];
+  static char   display_opt[20] = "--display";
 
   strcpy( opplace_str, "");
   hot_xtt = this;
@@ -493,25 +497,23 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) :
   }
 
   // Set language
-  for ( i = 1; i < argc; i++) {
-    if ( strcmp( argv[i], "-l") == 0 && i + 1 < argc)
-      Lng::set( argv[i+1]);
-    else if ( strcmp( argv[i], "-q") == 0) {
-      CoWow::HideWarranty();
+  for ( i = 1; i < *argc; i++) {
+    if ( strcmp( (*argv)[i], "-l") == 0 && i + 1 < *argc)
+      strncpy( language, (*argv)[i+1], sizeof(language));
+    else if ( strcmp( (*argv)[i], "-q") == 0)
       quiet = 1;
-    }
-    else if ( strcmp( argv[i], "-a") == 0)
+    else if ( strcmp( (*argv)[i], "-a") == 0)
       attach_audio = 1;
-    else if ( strcmp( argv[i], "-s") == 0)
+    else if ( strcmp( (*argv)[i], "-s") == 0)
       select_opplace = 1;
-    else if ( strcmp( argv[i], "-c") == 0)
+    else if ( strcmp( (*argv)[i], "-c") == 0)
       op_close_button = 1;
-    else if ( strcmp( argv[i], "-d") == 0)
+    else if ( strcmp( (*argv)[i], "-d") == 0)
       no_advanceduser = 1;
-    else if ( strcmp( argv[i], "-u") == 0 && i + 1 < argc) {
+    else if ( strcmp( (*argv)[i], "-u") == 0 && i + 1 < *argc) {
       char oname[80];
 
-      strcpy( opplace_str, argv[i+1]);
+      strcpy( opplace_str, (*argv)[i+1]);
 
       sts = gdh_GetClassList( pwr_cClass_OpPlace, &op_objid);
       while (ODD(sts)) {
@@ -530,11 +532,11 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) :
     }
   }
 
-  if ( !opplace_found && argc >= 2 && strncmp( argv[1], "-", 1) != 0) {
+  if ( !opplace_found && *argc >= 2 && strncmp( (*argv)[1], "-", 1) != 0) {
     pwr_tClassId op_class;
 
     // First argument is opplace object
-    strcpy( opplace_str, argv[1]);
+    strcpy( opplace_str, (*argv)[1]);
 
     sts = gdh_NameToObjid( opplace_str, &op_objid);
     if ( EVEN(sts)) {
@@ -552,6 +554,82 @@ Xtt::Xtt( int argc, char *argv[], int *return_sts) :
 
     opplace_found = 1;
   }
+  else {
+    // Look for default opplace
+    pwr_tOid oid;
+    pwr_tOName name;
+
+    for ( sts = gdh_GetClassList( pwr_cClass_OpPlace, &oid); 
+	  ODD(sts);
+	  sts = gdh_GetNextObject( oid, &oid)) {
+      sts = gdh_ObjidToName( oid, name, sizeof(name), cdh_mName_object);
+      if ( ODD(sts) && cdh_NoCaseStrcmp( name, "opdefault") == 0) {
+	sts = gdh_ObjidToName( oid, name, sizeof(name), cdh_mNName);
+	if ( EVEN(sts)) exit(sts);
+
+	strcpy( opplace_str, name);
+	opplace_found = 1;
+	break;
+      }
+    }
+  }
+
+  if ( opplace_found) {
+    pwr_sClass_OpPlace *opp;
+    char opsys_user[40];
+
+    sts = gdh_NameToPointer( opplace_str, (void **)&opp);
+    if ( EVEN(sts)) exit(sts);
+    
+    if ( strcmp( opp->DedicatedOpsysUser, "") != 0) {
+      sts = syi_UserName( opsys_user, sizeof(opsys_user));
+      if ( EVEN(sts)) exit(sts);
+
+      if ( strcmp( opp->DedicatedOpsysUser, opsys_user) != 0) {
+	printf( "Operator place is dedicated for another user\n");
+	exit(0);
+      }
+    }
+
+    if ( strcmp( language, "") == 0) {
+      switch ( opp->Language) {
+      case pwr_eLanguageEnum_Swedish:
+	strcpy( language, "sv_se");
+	break;
+      case pwr_eLanguageEnum_German:
+	strcpy( language, "de_de");
+	break;
+      case pwr_eLanguageEnum_French:
+	strcpy( language, "fr_fr");
+	break;
+      default:
+	strcpy( language, "");
+      }
+    }
+    if ( strcmp( opp->Display, "") != 0) {
+      strncpy( display, opp->Display, sizeof(display));
+      char **argv1 = (char **)calloc( *argc + 3, sizeof(*argv1));
+      for ( int i = 0; i < *argc; i++)
+	argv1[i] = (*argv)[i];
+      argv1[*argc] = display_opt;
+      argv1[*argc+1] = display;
+      argv1[*argc+2] = 0;
+      (*argc) += 2;
+      *argv = argv1;
+    }
+    if ( opp->OpWindLayout & pwr_mOpWindLayoutMask_HideLicenceWindow)
+      quiet = 1;
+
+    if ( opp->AttachAudio)
+      attach_audio = 1;
+  }
+
+  if ( quiet)
+    CoWow::HideWarranty();
+
+  if ( strcmp( language, "") != 0)
+    Lng::set( language);
+
 }
 
 void Xtt::opplace_selected_cb( void *ctx, char *text)

xtt/lib/xtt/gtk/xtt_clog_gtk.cpp

@@ -56,10 +56,10 @@ CLogGtk::CLogGtk( void *clog_parent_ctx,
 {
 
   toplevel = (GtkWidget *) g_object_new( GTK_TYPE_WINDOW, 
-			   "default-height", 800,
-			   "default-width", 1000,
-			   "title", clog_name,
-			   NULL);
+					 "default-height", 800,
+					 "default-width", 1000,
+					 "title", CoWowGtk::translate_utf8(clog_name),
+					 NULL);
 
   g_signal_connect( toplevel, "delete_event", G_CALLBACK(delete_event), this);
   g_signal_connect( toplevel, "destroy", G_CALLBACK(destroy_event), this);
@@ -156,7 +156,7 @@ CLogGtk::CLogGtk( void *clog_parent_ctx,
 
 
   // Menu Help
-  GtkWidget *help_help = gtk_image_menu_item_new_with_mnemonic(CoWowGtk::translate_utf8("_Help on ConsoleLog"));
+  GtkWidget *help_help = gtk_image_menu_item_new_with_mnemonic(CoWowGtk::translate_utf8("_Help on System Messages"));
   gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(help_help), 
 				 gtk_image_new_from_stock( "gtk-help", GTK_ICON_SIZE_MENU));
   g_signal_connect(help_help, "activate", G_CALLBACK(activate_help), this);

xtt/lib/xtt/gtk/xtt_ev_gtk.cpp

@@ -81,13 +81,14 @@ EvGtk::EvGtk( void *ev_parent_ctx,
 	      int display_return,
 	      int display_ack,
 	      int ev_beep,
+	      pwr_tMask ev_pop_mask,
 	      pwr_tStatus *status) :
   Ev( ev_parent_ctx, eve_name, ala_name, blk_name, ev_user, display_ala, display_eve,
-      display_blk, display_return, display_ack, ev_beep, status),
+      display_blk, display_return, display_ack, ev_beep, ev_pop_mask, status),
   parent_wid(ev_parent_wid), parent_wid_eve(NULL), parent_wid_ala(NULL)
 {
   pwr_tStatus sts;
-  pwr_sClass_User *userobject_ptr;
+  pwr_sClass_OpPlace *userobject_ptr;
   const int eve_width = 700;
   const int eve_height = 600;
   const int ala_width = 700;

xtt/lib/xtt/gtk/xtt_ev_gtk.h

@@ -41,6 +41,7 @@ class EvGtk : public Ev {
 	int display_return,
 	int display_ack,
 	int ev_beep,
+	pwr_tMask ev_pop_mask,
 	pwr_tStatus *status);
     ~EvGtk();
 

xtt/lib/xtt/gtk/xtt_ge_gtk.cpp

@@ -27,6 +27,7 @@ typedef void *Widget;
 
 #include "glow.h"
 
+#include "xtt_xnav.h"
 #include "rt_gdh.h"
 #include "rt_gdh_msg.h"
 #include "co_cdh.h"
@@ -39,7 +40,6 @@ typedef void *Widget;
 #include "co_lng.h"
 #include "xtt_ge_gtk.h"
 #include "ge_graph_gtk.h"
-#include "xtt_xnav.h"
 
 gboolean XttGeGtk::action_inputfocus( GtkWidget *w, GdkEvent *event, gpointer data)
 {

xtt/lib/xtt/gtk/xtt_op_gtk.h

@@ -30,6 +30,17 @@
 # include "co_wow_gtk.h"
 #endif
 
+#include <vector>
+
+class OpCmd {
+ public:
+  GtkWidget *w;
+  pwr_tCmd  cmd;
+
+  OpCmd( GtkWidget *widget, const char *command) : w(widget)
+    { strncpy( cmd, command, sizeof(cmd));}
+};
+
 class OpGtk : public Op {
  public:
   OpGtk( void *op_parent_ctx,
@@ -51,20 +62,24 @@ class OpGtk : public Op {
   GtkWidget		*balarm_ebox;
   GtkWidget		*balarm_mark;
   GtkWidget		*appl_form;
-  GtkWidget		*eventlog_button;
-  GtkWidget		*help_button;
   GtkWidget		*decr_button;
   GtkWidget		*tools_close;
+  GtkWidget		*funcbox[5];
+  GtkMenuBar		*menu_bar;
   int			a_height;
   int			a_exist[5];
   int			a_active[5];
   int			text_size;
   CoWowFocusTimerGtk 	poptimer;
+  vector<OpCmd> cmd_vect;
 
   void	map();
   int 	configure( char *opplace_str);
   void 	update_alarm_info();
   void  add_close_button();
+  int   get_cmd( GtkWidget *w, char *cmd);
+  int   create_menu_item( const char *name, int pixmap, int append, const char *cmd);
+  int   delete_menu_item( const char *name);
 
   static void activate_exit( GtkWidget *w, gpointer data);
   static void activate_aalarm_ack( GtkWidget *w, gpointer data);
@@ -76,9 +91,20 @@ class OpGtk : public Op {
   static void activate_alarmlist( GtkWidget *w, gpointer data);
   static void activate_eventlist( GtkWidget *w, gpointer data);
   static void activate_eventlog( GtkWidget *w, gpointer data);
+  static void activate_blocklist( GtkWidget *w, gpointer data);
   static void activate_navigator( GtkWidget *w, gpointer data);
   static void activate_help( GtkWidget *w, gpointer data);
   static void activate_help_overview( GtkWidget *w, gpointer data);
+  static void activate_help_opwin( GtkWidget *w, gpointer data);
+  static void activate_help_proview( GtkWidget *w, gpointer data);
+  static void activate_trend( GtkWidget *w, gpointer data);
+  static void activate_fast( GtkWidget *w, gpointer data);
+  static void activate_history( GtkWidget *w, gpointer data);
+  static void activate_switch_user( GtkWidget *w, gpointer data);
+  static void activate_show_user( GtkWidget *w, gpointer data);
+  static void activate_logout( GtkWidget *w, gpointer data);
+  static void activate_cmd_menu_item( GtkWidget *w, gpointer data);
+  static void activate_graph( GtkWidget *w, gpointer data);
   static void activate_appl1( GtkWidget *w, gpointer data);
   static void activate_appl2( GtkWidget *w, gpointer data);
   static void activate_appl3( GtkWidget *w, gpointer data);
@@ -94,6 +120,16 @@ class OpGtk : public Op {
   static void activate_appl13( GtkWidget *w, gpointer data);
   static void activate_appl14( GtkWidget *w, gpointer data);
   static void activate_appl15( GtkWidget *w, gpointer data);
+  static void activate_appl16( GtkWidget *w, gpointer data);
+  static void activate_appl17( GtkWidget *w, gpointer data);
+  static void activate_appl18( GtkWidget *w, gpointer data);
+  static void activate_appl19( GtkWidget *w, gpointer data);
+  static void activate_appl20( GtkWidget *w, gpointer data);
+  static void activate_appl21( GtkWidget *w, gpointer data);
+  static void activate_appl22( GtkWidget *w, gpointer data);
+  static void activate_appl23( GtkWidget *w, gpointer data);
+  static void activate_appl24( GtkWidget *w, gpointer data);
+  static void activate_appl25( GtkWidget *w, gpointer data);
 };
 
 #endif

xtt/lib/xtt/gtk/xtt_xnav_gtk.cpp

@@ -187,13 +187,13 @@ XCrr *XNavGtk::xcrr_new( pwr_tAttrRef *arp, int advanced_user, pwr_tStatus *sts)
 }
 
 Ev *XNavGtk::ev_new( char *eve_name, char *ala_name, char *blk_name,
-		      pwr_tObjid ev_user, int display_ala, int display_eve,
-		      int display_blk, int display_return, int display_ack,
-		      int ev_beep, pwr_tStatus *status)
+		     pwr_tObjid ev_user, int display_ala, int display_eve,
+		     int display_blk, int display_return, int display_ack,
+		     int ev_beep, pwr_tMask ev_pop_mask, pwr_tStatus *status)
 {
   return new EvGtk( this, parent_wid, eve_name, ala_name, blk_name,
 		    ev_user, display_ala, display_eve, display_blk,
-		    display_return, display_ack, ev_beep, status);
+		    display_return, display_ack, ev_beep, ev_pop_mask, status);
 }
 
 Hist *XNavGtk::hist_new( char *title, pwr_tOid oid, pwr_tStatus *sts)

xtt/lib/xtt/gtk/xtt_xnav_gtk.h

@@ -51,7 +51,7 @@ class XNavGtk : public XNav {
     Ev *ev_new( char *eve_name, char *ala_name, char *blk_name,
 		pwr_tObjid ev_user, int display_ala, int display_eve,
 		int display_blk, int display_return, int display_ack,
-		int ev_beep, pwr_tStatus *status);
+		int ev_beep, pwr_tMask ev_pop_mask, pwr_tStatus *status);
     Hist *hist_new( char *title, pwr_tOid oid, pwr_tStatus *sts);
     Block *block_new( pwr_tAttrRef *arp, char *name, unsigned int priv,
 		      pwr_tStatus *sts);

xtt/lib/xtt/motif/xtt_ev_motif.cpp

@@ -60,9 +60,10 @@ EvMotif::EvMotif( void *ev_parent_ctx,
 		  int display_return,
 		  int display_ack,
 		  int ev_beep,
+		  pwr_tMask ev_pop_mask,
 		  pwr_tStatus *status) :
   Ev( ev_parent_ctx, eve_name, ala_name, blk_name, ev_user, display_ala, display_eve,
-      display_blk, display_return, display_ack, ev_beep, status),
+      display_blk, display_return, display_ack, ev_beep, ev_pop_mask, status),
   parent_wid(ev_parent_wid), parent_wid_eve(NULL), parent_wid_ala(NULL)
 {
   char		uid_filename[120] = {"xtt_eve.uid"};

xtt/lib/xtt/motif/xtt_ev_motif.h

@@ -45,6 +45,7 @@ class EvMotif : public Ev {
 	int display_return,
 	int display_ack,
 	int ev_beep,
+	pwr_tMask ev_pop_mask,
 	pwr_tStatus *status);
     ~EvMotif();
 

xtt/lib/xtt/motif/xtt_op_motif.cpp

@@ -421,9 +421,7 @@ int OpMotif::configure( char *opplace_str)
   int 		sts;
   int		i;
   pwr_tObjid 	opplace;
-  pwr_tObjid 	user;
   pwr_sClass_OpPlace *opplace_p;
-  pwr_sClass_User *user_p;
   pwr_sAttrRef	attrref;
   XmFontList    fontlist;
   XmFontListEntry entry;
@@ -434,24 +432,9 @@ int OpMotif::configure( char *opplace_str)
   sts = gdh_ObjidToPointer( opplace, (void **) &opplace_p);
   if ( EVEN(sts)) return sts;
 
-  // Fix 
-  if ( strncmp( opplace_p->OpWinProgram, "Jop", 3) == 0)
+  if ( opplace_p->StartJavaProcess)
     start_jop = 1;
 
-  // Find matching user object
-  sts = gdh_GetClassList( pwr_cClass_User, &user);
-  while ( ODD (sts))
-  {
-
-    sts = gdh_ObjidToPointer( user, (void **) &user_p);
-    if ( EVEN(sts)) return sts;
-
-    if ( user_p->OpNumber == opplace_p->OpNumber)
-      break;
-    sts = gdh_GetNextObject( user, &user);
-  }
-  if ( EVEN(sts)) return sts;
-
   // Load font
   entry = XmFontListEntryCreate( (char*) "tag1", XmFONT_IS_FONT, 
 	XLoadQueryFont( flow_Display(appl_form), 
@@ -460,10 +443,7 @@ int OpMotif::configure( char *opplace_str)
   XtFree( (char *)entry);
 
   // Examine Graph objects
-  button_cnt = user_p->NoFastAvail;
-  if ( button_cnt > 15)
-    button_cnt = 15;
-  for ( i = 0; i < button_cnt; i++)
+  for ( i = 0; i < 15; i++)
   {
     if ( i >= 15)
       break;
@@ -471,19 +451,28 @@ int OpMotif::configure( char *opplace_str)
     sts = gdh_ClassAttrToAttrref( pwr_cClass_XttGraph, ".ButtonText", &attrref);
     if ( EVEN(sts)) return sts;
 
-    attrref = cdh_ArefAdd( &user_p->FastAvail[i], &attrref);
-    sts = gdh_GetObjectInfoAttrref( &attrref, (void *)button_title[i], 
-		sizeof(button_title[0]));
-    if ( EVEN(sts)) 
-      strcpy( button_title[i], "");
+    if ( cdh_ObjidIsNotNull( opplace_p->FastAvail[i].Objid)) {
 
-    button_aref[i] = attrref.Objid;
+      attrref = cdh_ArefAdd( &opplace_p->FastAvail[i], &attrref);
+      sts = gdh_GetObjectInfoAttrref( &attrref, (void *)button_title[i], 
+				      sizeof(button_title[0]));
+      if ( ODD(sts)) 
+	button_aref[i] = attrref.Objid;
+      else
+	button_aref[i] = pwr_cNOid;
+    }
+    else 
+      button_aref[i] = pwr_cNOid;      
   }
 
   // Create the application buttons
   for ( i = 0; i < button_cnt; i++)
   {
     Widget b[15];
+
+    if ( cdh_ObjidIsNull( button_aref[i]))
+      continue;	 
+
     switch ( i)
     {
       case 0:

xtt/lib/xtt/src/xtt_ev.cpp

@@ -53,13 +53,14 @@ Ev::Ev( void *ev_parent_ctx,
 	int display_return,
 	int display_ack,
 	int ev_beep,
+	pwr_tMask ev_pop_mask,
 	pwr_tStatus *status) :
   parent_ctx(ev_parent_ctx),
   user(ev_user), eve_display_ack(display_ack), 
   eve_display_return(display_return),
   start_trace_cb(NULL), display_in_xnav_cb(NULL), update_info_cb(NULL),
   help_cb(NULL), popup_menu_cb(0), sound_cb(0), eve(NULL), ala(NULL),
-  connected(0), ala_displayed(0), eve_displayed(0), beep(ev_beep)
+  connected(0), ala_displayed(0), eve_displayed(0), beep(ev_beep), pop_mask(ev_pop_mask)
 {
 }
 
@@ -309,8 +310,7 @@ void Ev::create_aliaslist( void *up)
   int i, j;
   int alias_size;
   ev_sAlias dum;
-  pwr_sClass_User *userp = (pwr_sClass_User *)up;
-
+  pwr_sClass_OpPlace *userp = (pwr_sClass_OpPlace *)up;
   int listsize = MIN( sizeof(userp->SelectList)/sizeof(userp->SelectList[0]),
 		      sizeof(alias_list)/sizeof(alias_list[0]));
 						    
@@ -398,9 +398,31 @@ pwr_tStatus Ev::mh_alarm_bc( mh_sMessage *MsgP)
   ev->ala->event_alarm( MsgP);
   if ( ev->update_info_cb)
     ev->update_info_cb( ev->parent_ctx);
-  if ( ev->pop_cb)
-    ev->pop_cb( ev->parent_ctx);
+  if ( ev->pop_cb) {
+    int pop = 0;
 
+    switch ( ((mh_sMsgInfo *)MsgP)->EventPrio) {
+    case mh_eEventPrio_A:
+      if ( ev->pop_mask & pwr_mOpWindPopMask_Aalarm)
+	pop = 1;
+      break;
+    case mh_eEventPrio_B:
+      if ( ev->pop_mask & pwr_mOpWindPopMask_Balarm)
+	pop = 1;
+      break;
+    case mh_eEventPrio_C:
+      if ( ev->pop_mask & pwr_mOpWindPopMask_Calarm)
+	pop = 1;
+      break;
+    case mh_eEventPrio_D:
+      if ( ev->pop_mask & pwr_mOpWindPopMask_Dalarm)
+	pop = 1;
+      break;
+    default: ;
+    }
+    if ( pop)
+      ev->pop_cb( ev->parent_ctx);
+  }
   return 1;
 }
 
@@ -427,6 +449,9 @@ pwr_tStatus Ev::mh_info_bc( mh_sMessage *MsgP)
   ev->ala->event_info( MsgP);
   if ( ev->update_info_cb)
     ev->update_info_cb( ev->parent_ctx);
+  if ( ev->pop_mask & pwr_mOpWindPopMask_InfoMsg)
+    ev->pop_cb( ev->parent_ctx);
+
   return 1;
 }
 

xtt/lib/xtt/src/xtt_ev.h

@@ -51,6 +51,7 @@ class Ev {
 	int display_return,
 	int display_ack,
 	int ev_beep,
+	pwr_tMask ev_pop_mask,
 	pwr_tStatus *status);
     virtual ~Ev();
 
@@ -81,6 +82,7 @@ class Ev {
     ev_sAlias		alias_list[20];
     CoWow		*wow;
     static Ev		*ev;
+    pwr_tMask		pop_mask;
 
     virtual void map_eve() {}
     virtual void map_ala() {}

xtt/lib/xtt/src/xtt_ge.cpp

@@ -23,6 +23,7 @@
 #include <stdlib.h>
 
 #include "glow.h"
+#include "xtt_xnav.h"
 #include "rt_gdh.h"
 #include "rt_gdh_msg.h"
 #include "co_cdh.h"
@@ -33,7 +34,6 @@
 #include "co_lng.h"
 #include "xtt_ge.h"
 #include "ge_graph.h"
-#include "xtt_xnav.h"
 
 void XttGe::graph_init_cb( void *client_data)
 {

xtt/lib/xtt/src/xtt_op.cpp

@@ -32,6 +32,7 @@
 #include "rt_mh_outunit.h"
 #include "co_wow.h"
 #include "co_lng.h"
+#include "co_xhelp.h"
 #include "xtt_op.h"
 #include "rt_xnav_msg.h"
 
@@ -131,12 +132,77 @@ void Op::activate_eventlog()
     command_cb( parent_ctx, cmd);
 }
 
+void Op::activate_blocklist()
+{
+  char cmd[20] = "show blocklist";
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
+void Op::activate_trend()
+{
+  char cmd[200] = "show objectlist/class=dstrend/title=\"Trend List\"";
+
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
+void Op::activate_fast()
+{
+  char cmd[200] = "show objectlist/class=dsfastcurve/title=\"Fast Curve List\"";
+
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
+void Op::activate_history()
+{
+  char cmd[200] = "show objectlist/class=sevhist/title=\"Process History List\"";
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
+void Op::activate_graph()
+{
+  char cmd[200] = "show objectlist/class=xttgraph/title=\"Process Graphic List\"";
+
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
 void Op::activate_navigator()
 {
   if ( map_cb)
     map_cb( parent_ctx);
 }
 
+void Op::activate_switch_user()
+{
+  char cmd[200] ="login";
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
+void Op::activate_show_user()
+{
+  char cmd[200] ="show user/window";
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
+void Op::activate_logout()
+{
+  char cmd[200] ="logout /messagewindow";
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
+void Op::activate_cmd_menu_item( char *cmd)
+{
+  if ( command_cb)
+    command_cb( parent_ctx, cmd);
+}
+
 void Op::activate_help()
 {
   if ( help_cb)
@@ -149,6 +215,16 @@ void Op::activate_help_overview()
     help_cb( parent_ctx, "overview");
 }
 
+void Op::activate_help_opwin()
+{
+  CoXHelp::dhelp("opg_opwindow", "", navh_eHelpFile_Other, "$pwr_lang/man_opg.dat", 0);
+}
+
+void Op::activate_help_proview()
+{
+  CoXHelp::dhelp( "version", "", navh_eHelpFile_Other, "$pwr_exe/xtt_version_help.dat", 0);
+}
+
 void Op::jop_command_cb( void *op, char *command)
 {
   if ( ((Op *)op)->command_cb)

xtt/lib/xtt/src/xtt_op.h

@@ -45,8 +45,8 @@ class Op {
   void 		*parent_ctx;
   unsigned long	balarm_prio;
   unsigned long	balarm_type;
-  char		button_title[20][80];
-  pwr_tAttrRef  button_aref[20];
+  char		button_title[25][80];
+  pwr_tAttrRef  button_aref[25];
   int	       	button_cnt;
   int	       	start_jop;
   Jop	       	*jop;
@@ -67,6 +67,8 @@ class Op {
   virtual int 	configure( char *opplace_str) {return 0;}
   virtual void 	update_alarm_info() {}
   virtual void  add_close_button() {}
+  virtual int   create_menu_item( const char *name, int pixmap, int append, const char *cmd) { return 0;}
+  virtual int   delete_menu_item( const char *name) { return 0;}
 
   void	set_jop_qid( int qix) { if ( jop) jop->set_jop_qid( qix);};
   void	scan();
@@ -78,9 +80,20 @@ class Op {
   void activate_alarmlist();
   void activate_eventlist();
   void activate_eventlog();
+  void activate_blocklist();
   void activate_navigator();
+  void activate_trend();
+  void activate_fast();
+  void activate_history();
+  void activate_graph();
   void activate_help();
   void activate_help_overview();
+  void activate_help_opwin();
+  void activate_help_proview();
+  void activate_switch_user();
+  void activate_show_user();
+  void activate_logout();
+  void activate_cmd_menu_item( char *cmd);
 
   static void jop_command_cb( void *op, char *command);
 };

xtt/lib/xtt/src/xtt_xnav.h

@@ -30,6 +30,10 @@ extern "C" {
 # include "pwr.h"
 #endif
 
+#ifndef pwr_baseclasses_h
+#include "pwr_baseclasses.h"
+#endif
+
 #ifndef co_regex_h
 # include "co_regex.h"
 #endif
@@ -179,6 +183,9 @@ typedef enum {
 	applist_eType_Fast
 } applist_eType;
 
+
+class XNav;
+
 class ApplListElem {
   public:
     ApplListElem( applist_eType al_type, void *al_ctx, pwr_sAttrRef *al_arp,
@@ -211,53 +218,41 @@ class ApplList {
 class XNavGbl {
   public:
     XNavGbl() :
-      priv(0), UserObject(pwr_cNObjid), AlarmAutoLoad(0), AlarmMessage(0),
-      AlarmBeep(0), AlarmReturn(0), AlarmAck(0), gdh_started(1),
+      priv(0), OpObject(pwr_cNObjid),
+      AlarmBeep(0), AlarmReturn(0), AlarmAck(0), hide_opwind(0), hide_statusbar(0), 
+      op_wind_pop(0), gdh_started(1),
       verify(0), scantime(0.5), signal_test_mode(0), advanced_user(1), show_truedb(0),
       show_allattr(0), no_graph_ratio(0)
       { 
 	strcpy( version, xnav_cVersion); strcpy( time, "");
-	strcpy( ConfigureObject, ""); strcpy( AlarmLastMessage, "");
-	strcpy( AlarmText1, ""); strcpy( AlarmText2, ""); strcpy( AlarmText3, ""); 
-	strcpy( AlarmText4, ""); strcpy( AlarmText5, ""); 
-	strcpy( platform, ""); strcpy( os, ""); strcpy( hw, "");
-	strcpy( node, ""); strcpy( sys, ""); strcpy( default_directory, "");
-	strcpy( symbolfilename, "");
+	strcpy( OpPlace, "");
+	strcpy( default_directory, "");
+	strcpy( setupscript, "");
       };
     char		version[10];
     char		time[80];
     unsigned long	priv;
-    char		ConfigureObject[80];
-    pwr_tObjid		UserObject;
-    int			AlarmAutoLoad;
-    int			AlarmMessage;
+    pwr_tOName		OpPlace;
+    pwr_tObjid		OpObject;
     int			AlarmBeep;
     int			AlarmReturn;
     int			AlarmAck;
+    int			hide_opwind;
+    int			hide_statusbar;
+    pwr_tMask		op_wind_pop;
     int 		gdh_started;
-    char		AlarmLastMessage[80];
-    char		AlarmText1[80];
-    char		AlarmText2[80];
-    char		AlarmText3[80];
-    char		AlarmText4[80];
-    char		AlarmText5[80];
-    char		platform[20];
-    char		os[20];
-    char		hw[20];
     int			verify;
-    char		node[20];
-    char		sys[20];
     char		default_directory[80];
     double		scantime;
-    char		symbolfilename[80];
+    pwr_tFileName      	setupscript;
     int			signal_test_mode;
     int			advanced_user;
     int			show_truedb;
     int			show_allattr;
     int			no_graph_ratio;
 
-    int			load_config( void *xnav);
-    int			symbolfile_exec( void *xnav);
+    int			load_config( XNav *xnav);
+    int			setupscript_exec( XNav *xnav);
 };
 
 class XNav {
@@ -300,6 +295,7 @@ class XNav {
     CLog		*clog;
     int			closing_down;
     pwr_tOName		opplace_name;
+    pwr_sClass_OpPlace	*opplace_p;
     char		base_user[80];
     char		user[80];
     unsigned int	base_priv;
@@ -333,7 +329,7 @@ class XNav {
     virtual Ev *ev_new( char *eve_name, char *ala_name, char *blk_name,
 			pwr_tObjid ev_user, int display_ala, int display_eve,
 			int display_blk, int display_return, int display_ack,
-			int ev_beep, pwr_tStatus *status) { return 0;}
+			int ev_beep, pwr_tMask ev_pop_mask, pwr_tStatus *status) { return 0;}
     virtual Hist *hist_new( char *title, pwr_tOid oid, pwr_tStatus *sts) {return 0;}
     virtual Block *block_new( pwr_tAttrRef *arp, char *name, unsigned int priv,
 		      pwr_tStatus *sts) {return 0;}

xtt/mmi/xtt/en_us/xtt_lng.dat

@@ -102,6 +102,7 @@ E 1.1.96 "Eventlog"
 E 1.1.97 "Confirm"
 E 1.1.98 "Search string"
 E 1.1.99 "History"
+E 1.1.100 " List"
 #
 # Logging entry
 E 1.2.1 "Active"
@@ -153,8 +154,8 @@ E 1.8.2 "_Next File"
 E 1.8.3 "_Previous File"
 E 1.8.4 "_Select File"
 E 1.8.5 "_Filter"
-E 1.8.6 "Consolelog"
-E 1.8.7 "_Help on ConsoleLog"
+E 1.8.6 "System Messages"
+E 1.8.7 "_Help on System Messages"
 E 1.8.8 "Help on _Selected Message"
 #
 # Eventlog
@@ -230,6 +231,37 @@ E 1.12.15 "_Mode"
 E 1.12.16 "On _Trace"
 E 1.12.17 "On _PlcPgm"
 #
+# Operator Window
+E 1.13.1 "Trend List"
+E 1.13.2 "Fast Curve List"
+E 1.13.3 "Process History List"
+E 1.13.4 "Process Graphic List"
+E 1.13.5 "Process Graphics"
+E 1.13.6 "_OperatorWindow"
+E 1.13.7 "_AlarmList"
+E 1.13.8 "_EventList"
+E 1.13.9 "Event_Log"
+E 1.13.10 "_BlockList"
+E 1.13.11 "_Alarm"
+E 1.13.12 "_Trends"
+E 1.13.13 "_Fast"
+E 1.13.14 "_Process History"
+E 1.13.15 "_Smaller Text"
+E 1.13.16 "_Larger Text"
+E 1.13.17 "_Navigator"
+E 1.13.18 "_Process Graphics"
+E 1.13.19 "Larger Text"
+E 1.13.20 "Smaller Text"
+E 1.13.21 "_Curves"
+E 1.13.22 "Trend List"
+E 1.13.23 "Fast Curve List"
+E 1.13.24 "Process History List"
+E 1.13.25 "Process Graphic List"
+E 1.13.26 "_User"
+E 1.13.27 "S_witch User"
+E 1.13.28 "_Show User"
+E 1.13.29 "_Return"
+#
 # Postscript printing
 E 2.1.1 "Contents"
 E 2.1.2 "page"

xtt/mmi/xtt/sv_se/xtt_lng.dat

@@ -102,6 +102,7 @@ E 1.1.96 "H
 E 1.1.97 "Verifiera"
 E 1.1.98 "Skstrng"
 E 1.1.99 "Historik"
+E 1.1.100 " Lista"
 #
 # Logging entry
 E 1.2.1 "Aktiv"
@@ -153,8 +154,8 @@ E 1.8.2 "_N
 E 1.8.3 "_Fregende Fil"
 E 1.8.4 "_Vlj Fil"
 E 1.8.5 "_Filter"
-E 1.8.6 "Konsollogg"
-E 1.8.7 "_Hjlp fr Konsollog"
+E 1.8.6 "System Meddelanden"
+E 1.8.7 "_Hjlp fr System Meddelanden"
 E 1.8.8 "_Hjlp fr utvalt meddelande"
 #
 # Eventlog
@@ -230,6 +231,37 @@ E 1.12.15 "_Mod"
 E 1.12.16 "Om _Trace"
 E 1.12.17 "Om _PlcPgm"
 #
+# Operator Window
+E 1.13.1 "Trend Lista"
+E 1.13.2 "Snabb Lista"
+E 1.13.3 "Process Historik Lista"
+E 1.13.4 "Process Grafik Lista"
+E 1.13.5 "Process Grafik"
+E 1.13.6 "_Operatrsfnster"
+E 1.13.7 "_Larmlista"
+E 1.13.8 "_Hndelselista"
+E 1.13.9 "Hndelse_Logg"
+E 1.13.10 "_Blockeringslista"
+E 1.13.11 "_Larm"
+E 1.13.12 "_Trendkurvor"
+E 1.13.13 "_Snabbkurvor"
+E 1.13.14 "_Process Historik"
+E 1.13.15 "_Mindre text"
+E 1.13.16 "_Strre text"
+E 1.13.17 "_Navigatr"
+E 1.13.18 "_Process Grafik"
+E 1.13.19 "Strre text"
+E 1.13.20 "Mindre text"
+E 1.13.21 "_Kurvor"
+E 1.13.22 "Trendkurvor"
+E 1.13.23 "Snabbkurvor"
+E 1.13.24 "Process Historik"
+E 1.13.25 "Process Grafik"
+E 1.13.26 "_Anvndare"
+E 1.13.27 "_Byt Anvndare"
+E 1.13.28 "_Visa Anvndare"
+E 1.13.29 "_terg"
+#
 # Postscript printing
 E 2.1.1 "Innehll"
 E 2.1.2 "sidan"