"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer0/os_gl.cpp" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

os_gl.cpp  (pymol-open-source-2.2.0)	:	os_gl.cpp  (pymol-open-source-2.3.0)
skipping to change at line 128		skipping to change at line 128
void plutBitmapCharacter(int c);		void plutBitmapCharacter(int c);
#endif		#endif
#ifdef _PYMOL_MIN_GLUT		#ifdef _PYMOL_MIN_GLUT
/* NULL GLUT: Bare Minimum GLUT implementation for getting PyMOL up in		/* NULL GLUT: Bare Minimum GLUT implementation for getting PyMOL up in
preparation for porting PYMOL to a non-GLUT environment (such as ActiveX)... */		preparation for porting PYMOL to a non-GLUT environment (such as ActiveX)... */
#include<GL/glut.h>		#include<GL/glut.h>
#ifndef NULL
#define NULL ((void*)0)
#endif
static void (*idleFunc) (void) = NULL;		static void (*idleFunc) (void) = NULL;
static int WinX = 640, WinY = 480;		static int WinX = 640, WinY = 480;
int p_glutCreateWindow(const char *title)		int p_glutCreateWindow(const char *title)
{		{
char **myArgv, *myArgvv[2], myArgvvv[1024] = "pymol";		char **myArgv, *myArgvv[2], myArgvvv[1024] = "pymol";
int myArgc;		int myArgc;
myArgc = 1;		myArgc = 1;
skipping to change at line 291		skipping to change at line 287
#endif		#endif
#ifdef _PYMOL_WX_GLUT		#ifdef _PYMOL_WX_GLUT
#include"P.h"		#include"P.h"
#include"main.h"		#include"main.h"
/* wxWindow-based GLUT emulation layer */		/* wxWindow-based GLUT emulation layer */
#ifndef NULL
#define NULL ((void*)0)
#endif
#ifndef false
#define false 0
#endif
#ifndef true
#define true 1
#endif
static void (*idleFunc) (void) = NULL;		static void (*idleFunc) (void) = NULL;
static void (*displayFunc) (void) = NULL;		static void (*displayFunc) (void) = NULL;
static void (*reshapeFunc) (int width, int height) = NULL;		static void (*reshapeFunc) (int width, int height) = NULL;
static void (*mouseFunc) (int button, int state, int x, int y) = NULL;		static void (*mouseFunc) (int button, int state, int x, int y) = NULL;
static void (*keyboardFunc) (unsigned char key, int x, int y) = NULL;		static void (*keyboardFunc) (unsigned char key, int x, int y) = NULL;
static void (*specialFunc) (int key, int x, int y) = NULL;		static void (*specialFunc) (int key, int x, int y) = NULL;
static void (*motionFunc) (int x, int y) = NULL;		static void (*motionFunc) (int x, int y) = NULL;
static void (*passiveMotionFunc) (int x, int y) = NULL;		static void (*passiveMotionFunc) (int x, int y) = NULL;
static int WinX = 640, WinY = 480;		static int WinX = 640, WinY = 480;
End of changes. 2 change blocks.
16 lines changed or deleted		0 lines changed or added

---