maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed: The cursor is now hidden in the window.

Browse Source 
TODO: Finish dependencies in Makefile and release :)
~g2k
This commit is contained in:
Tom Hicks
2005-07-15 03:09:38 -04:00
parent 148b62c11e
commit b60f87fa45
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/window.h
View File

@@ -39,6 +39,8 @@ namespace OpenArena
Display* GetDisplay(); Display* GetDisplay();
private: private:
Cursor CreateWindowedCursor();
Cursor CreateFullscreenCursor();
int screen; int screen;
::Window window; ::Window window;
GLXContext hRC; GLXContext hRC;

7
src/Makefile
View File

@@ -21,9 +21,11 @@ clean:
install: install:
#Executables
../OpenArena/OA: $(OBJECTS) ../OpenArena/OA: $(OBJECTS)
$(LD) $(LDFLAGS) -o ../OpenArena/OA $(OBJECTS) $(LD) $(LDFLAGS) -o ../OpenArena/OA $(OBJECTS)
#Dynamic Libraries
oa_game.so: oa_game.so:
oa_audio.so: oa_audio.so:
@@ -34,6 +36,7 @@ oa_video.so:
oa_input.so: oa_input.so:
#Object Files
screen.o: screen.cpp $(INCLUDEPATH)/screen.h screen.o: screen.cpp $(INCLUDEPATH)/screen.h
$(CPP) -c -o screen.o screen.cpp $(CPP) -c -o screen.o screen.cpp
@@ -43,10 +46,10 @@ bmp.o: bmp.cpp $(INCLUDEPATH)/bmp.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/datatyp
camera.o: camera.cpp $(INCLUDEPATH)/camera.h $(INCLUDEPATH)/vector.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/screen.h camera.o: camera.cpp $(INCLUDEPATH)/camera.h $(INCLUDEPATH)/vector.h $(INCLUDEPATH)/mygl.h $(INCLUDEPATH)/screen.h
$(CPP) -c -o camera.o camera.cpp $(CPP) -c -o camera.o camera.cpp
ctrls.o: ctrls.cpp $(INCLUDEPATH)/ctrls.h ctrls.o: ctrls.cpp $(INCLUDEPATH)/ctrls.h $(INCLUDEPATH)/keys.h $(INCLUDEPATH)/physics.h $(INCLUDEPATH)/datatypes.h $(INCLUDEPATH)/list.h
$(CPP) -c -o ctrls.o ctrls.cpp $(CPP) -c -o ctrls.o ctrls.cpp
level.o: level.cpp $(INCLUDEPATH)/level.h level.o: level.cpp $(INCLUDEPATH)/level.h $(INCLUDEPATH)/version.h
$(CPP) -c -o level.o level.cpp $(CPP) -c -o level.o level.cpp
$(INCLUDEPATH)/level.h: $(INCLUDEPATH)/myglFont.h $(INCLUDEPATH)/level.h: $(INCLUDEPATH)/myglFont.h

22
src/window.cpp
View File

@@ -150,6 +150,7 @@ bool OpenArena::Window::Open()
XMapRaised(display, window); XMapRaised(display, window);
XGrabKeyboard(display, window, true, GrabModeAsync, GrabModeAsync, CurrentTime); XGrabKeyboard(display, window, true, GrabModeAsync, GrabModeAsync, CurrentTime);
XGrabPointer(display, window, true, ButtonPressMask, GrabModeAsync, GrabModeAsync, window, None, CurrentTime); XGrabPointer(display, window, true, ButtonPressMask, GrabModeAsync, GrabModeAsync, window, None, CurrentTime);
XDefineCursor(display, window, CreateFullscreenCursor());
} }
else else
{ {
@@ -158,6 +159,7 @@ bool OpenArena::Window::Open()
XSetWMProtocols(display, window, &wmDelete, 1); XSetWMProtocols(display, window, &wmDelete, 1);
XSetStandardProperties(display, window, GetName(), GetName(), None, NULL, 0, NULL); XSetStandardProperties(display, window, GetName(), GetName(), None, NULL, 0, NULL);
XMapRaised(display, window); XMapRaised(display, window);
XDefineCursor(display, window, CreateWindowedCursor());
} }
glXMakeCurrent(display, window, hRC); glXMakeCurrent(display, window, hRC);
@@ -430,3 +432,23 @@ void OpenArena::Window::SetMousePosition(Vec2i pos)
SetCursorPos(pos.x, pos.y); SetCursorPos(pos.x, pos.y);
} }
#endif #endif
#ifdef __linux
Cursor OpenArena::Window::CreateWindowedCursor()
{
return CreateFullscreenCursor();
}
Cursor OpenArena::Window::CreateFullscreenCursor()
{
Pixmap pixmap = XCreatePixmap(display, window, 1, 1, 1);
XColor color;
color.pixel = 0;
color.red = 0;
color.flags = DoRed;
Cursor cur = XCreatePixmapCursor(display, pixmap, pixmap, &color, &color, 0, 0);
XFreePixmap(display, pixmap);
return cur;
}
#endif