Skip to content
Snippets Groups Projects
Commit f3faad6a authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

Correction overlay Motif

parent dd8b5745
Branches
Tags
No related merge requests found
// $Id: Geom.cpp,v 1.12 2001-01-12 13:28:58 geuzaine Exp $ // $Id: Geom.cpp,v 1.13 2001-01-24 11:24:05 geuzaine Exp $
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
...@@ -784,10 +784,21 @@ void ZeroHighlight(Mesh *m){ ...@@ -784,10 +784,21 @@ void ZeroHighlight(Mesh *m){
void BeginHighlight(void){ void BeginHighlight(void){
if(CTX.geom.highlight){ if(CTX.geom.highlight){
#ifdef _XMOTIF
if(CTX.overlay){
InitOverlay();
}
else{
Init();
}
#endif
Highlighted = 1; Highlighted = 1;
glPushMatrix(); glPushMatrix();
InitPosition(); InitPosition();
} #ifdef _XMOTIF
if(CTX.db) glDrawBuffer(GL_FRONT);
#endif
}
} }
...@@ -800,6 +811,9 @@ void EndHighlight(int permanent){ ...@@ -800,6 +811,9 @@ void EndHighlight(int permanent){
else{ else{
if(CTX.geom.highlight) { if(CTX.geom.highlight) {
glPopMatrix(); glPopMatrix();
#ifdef _XMOTIF
if(CTX.db) glDrawBuffer(GL_BACK);
#endif
} }
} }
} }
......
# $Id: Makefile,v 1.42 2001-01-19 22:32:31 remacle Exp $ # $Id: Makefile,v 1.43 2001-01-24 11:24:03 geuzaine Exp $
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Makefile for Gmsh # Makefile for Gmsh
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -24,8 +24,8 @@ OPENGL_MOTIF_LIB = -lGLw ...@@ -24,8 +24,8 @@ OPENGL_MOTIF_LIB = -lGLw
MESA_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLU.a\ MESA_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLU.a\
$(HOME)/SOURCES/Mesa-static/lib/libGL.a $(HOME)/SOURCES/Mesa-static/lib/libGL.a
MESA_MOTIF_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLw.a MESA_MOTIF_STATIC_LIB = $(HOME)/SOURCES/Mesa-static/lib/libGLw.a
XMOTIF_LIB = /usr/local/lib/libXm.so.2 -L/usr/X11R6/lib -lXt -lX11 -lXext # XMOTIF_LIB = /usr/local/lib/libXm.so.2 -L/usr/X11R6/lib -lXt -lX11 -lXext
# XMOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm\ XMOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm\
-L/usr/X11R6/lib -lXt -lX11 -lXext -L/usr/X11R6/lib -lXt -lX11 -lXext
FLTK_LIB = -L$(HOME)/SOURCES/fltk/lib -lfltk\ FLTK_LIB = -L$(HOME)/SOURCES/fltk/lib -lfltk\
-L/usr/X11R6/lib -lXext -lX11 -L/usr/X11R6/lib -lXext -lX11
......
// $Id: Message.cpp,v 1.4 2001-01-13 15:41:35 geuzaine Exp $ // $Id: Message.cpp,v 1.5 2001-01-24 11:24:06 geuzaine Exp $
#include <signal.h> #include <signal.h>
#include <sys/resource.h> #include <sys/resource.h>
...@@ -108,6 +108,7 @@ void Msg(int level, char *fmt, ...){ ...@@ -108,6 +108,7 @@ void Msg(int level, char *fmt, ...){
} }
break; break;
case STATUS2 : case STATUS2 :
case STATUS2N :
if(CTX.interactive){ if(CTX.interactive){
if(CTX.verbosity > 1){ if(CTX.verbosity > 1){
fprintf(stderr, STATUS_STR); fprintf(stderr, STATUS_STR);
...@@ -122,7 +123,8 @@ void Msg(int level, char *fmt, ...){ ...@@ -122,7 +123,8 @@ void Msg(int level, char *fmt, ...){
XmUpdateDisplay(WID.G.infoLabel); XmUpdateDisplay(WID.G.infoLabel);
} }
break; break;
case STATUS1: case STATUS1 :
case STATUS1N :
if(CTX.interactive){ if(CTX.interactive){
if(CTX.verbosity > 1){ if(CTX.verbosity > 1){
fprintf(stderr, STATUS_STR); fprintf(stderr, STATUS_STR);
...@@ -137,7 +139,8 @@ void Msg(int level, char *fmt, ...){ ...@@ -137,7 +139,8 @@ void Msg(int level, char *fmt, ...){
XmUpdateDisplay(WID.G.selectLabel); XmUpdateDisplay(WID.G.selectLabel);
} }
break; break;
case STATUS3: case STATUS3 :
case STATUS3N :
if(CTX.interactive){ if(CTX.interactive){
if(CTX.verbosity > 1){ if(CTX.verbosity > 1){
fprintf(stderr, STATUS_STR); fprintf(stderr, STATUS_STR);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment