pp & 3m

CMakeLists.txt

@@ -456,6 +456,12 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
     set_config_option(HAVE_MPEG_ENCODE "Mpeg")
   endif(ENABLE_MPEG_ENCODE)
 
+  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/3M)
+    add_subdirectory(contrib/3M)
+    include_directories(contrib/3M)
+    set_config_option(HAVE_3M "3M")
+  endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/3M)
+
   if(ENABLE_OSMESA)
     find_library(OSMESA_LIB OSMesa)
     if(OSMESA_LIB)

Common/GmshConfig.h.in

@@ -6,6 +6,7 @@
 #ifndef _GMSH_CONFIG_H_
 #define _GMSH_CONFIG_H_
 
+#cmakedefine HAVE_3M
 #cmakedefine HAVE_64BIT_SIZE_T
 #cmakedefine HAVE_ACIS
 #cmakedefine HAVE_ANN

Fltk/FlGui.cpp

@@ -890,15 +890,22 @@ void window_cb(Fl_Widget *w, void *data)
       oldy = FlGui::instance()->graph[0]->win->y();
       oldw = FlGui::instance()->graph[0]->win->w();
       oldh = FlGui::instance()->graph[0]->win->h();
+//#define FS
+#ifndef FS
       FlGui::instance()->graph[0]->win->resize(Fl::x(), Fl::y(), Fl::w(), Fl::h());
       FlGui::instance()->graph[0]->hideMessages();
       FlGui::check();
-      //FlGui::instance()->graph[0]->win->fullscreen();
+#else
+      FlGui::instance()->graph[0]->win->fullscreen();
+#endif
       zoom = 0;
     }
     else{
+#ifndef FS
       FlGui::instance()->graph[0]->win->resize(oldx, oldy, oldw, oldh);
-      //FlGui::instance()->graph[0]->win->fullscreen_off(oldx, oldy, oldw, oldh);
+#else
+      FlGui::instance()->graph[0]->win->fullscreen_off();
+#endif
       zoom = 1;
     }
     FlGui::instance()->menu->win->show();

Fltk/menuWindow.cpp

@@ -57,6 +57,9 @@ typedef unsigned long intptr_t;
 #if defined(HAVE_ONELAB)
 #include "onelab.h"
 #endif
+#if defined(HAVE_3M)
+#include "3M.h"
+#endif
 
 static void file_new_cb(Fl_Widget *w, void *data)
 {
@@ -2370,6 +2373,9 @@ static Fl_Menu_Item bar_table[] = {
     {"&Manipulator",     FL_CTRL+FL_SHIFT+'m', (Fl_Callback *)manip_cb, 0},
 #if defined(HAVE_ONELAB)
     {"&OneLab",          0, (Fl_Callback *)solver_cb, (void*)(-1), FL_MENU_DIVIDER},
+#endif
+#if defined(HAVE_3M)
+    {"&3M",              0, (Fl_Callback *)window3M_cb, 0, FL_MENU_DIVIDER},
 #endif
     {"S&tatistics",      FL_CTRL+'i', (Fl_Callback *)statistics_cb, 0},
     {"M&essage Console", FL_CTRL+'l', (Fl_Callback *)message_cb, 0},
@@ -2435,6 +2441,9 @@ static Fl_Menu_Item sysbar_table[] = {
     {"Manipulator",     FL_META+FL_SHIFT+'m', (Fl_Callback *)manip_cb, 0},
 #if defined(HAVE_ONELAB)
     {"OneLab",          0, (Fl_Callback *)solver_cb, (void*)(-1), FL_MENU_DIVIDER},
+#endif
+#if defined(HAVE_3M)
+    {"3M",              0, (Fl_Callback *)window3M_cb, 0, FL_MENU_DIVIDER},
 #endif
     {"Statistics",      FL_META+'i', (Fl_Callback *)statistics_cb, 0},
     {"Message Console", FL_META+'l', (Fl_Callback *)message_cb, 0},