Menu
▾
▴
hgengine-cvs
|
From: <axl...@us...> - 2008-12-30 19:40:26
|
Revision: 101
http://hgengine.svn.sourceforge.net/hgengine/?rev=101&view=rev
Author: axlecrusher
Date: 2008-12-30 19:40:22 +0000 (Tue, 30 Dec 2008)
Log Message:
-----------
enable depth test
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2008-12-30 19:40:00 UTC (rev 100)
+++ Mercury2/src/X11Window.cpp 2008-12-30 19:40:22 UTC (rev 101)
@@ -72,6 +72,7 @@
m_window = win;
m_renderCtx = ctx;
+ glEnable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <axl...@us...> - 2009-04-13 10:51:13
|
Revision: 212
http://hgengine.svn.sourceforge.net/hgengine/?rev=212&view=rev
Author: axlecrusher
Date: 2009-04-13 10:51:03 +0000 (Mon, 13 Apr 2009)
Log Message:
-----------
enable window resizing
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-04-12 23:37:04 UTC (rev 211)
+++ Mercury2/src/X11Window.cpp 2009-04-13 10:51:03 UTC (rev 212)
@@ -142,7 +142,12 @@
XMotionEvent* e = (XMotionEvent*)&event;
break;
}
-
+ case ConfigureNotify:
+ {
+ XConfigureEvent* e = (XConfigureEvent*)&event;
+ glViewport(0,0, e->width, e->height);
+ break;
+ }
default:
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-06-24 02:16:38
|
Revision: 369
http://hgengine.svn.sourceforge.net/hgengine/?rev=369&view=rev
Author: cnlohr
Date: 2009-06-24 02:15:27 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
fix crash on exit
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-06-24 00:34:53 UTC (rev 368)
+++ Mercury2/src/X11Window.cpp 2009-06-24 02:15:27 UTC (rev 369)
@@ -115,6 +115,7 @@
if ( unsigned(event.xclient.data.l[0]) == m_wmDeleteMessage )
{
XDestroyWindow(m_display,m_window);
+ return false;
}
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wil...@us...> - 2009-07-15 01:59:18
|
Revision: 422
http://hgengine.svn.sourceforge.net/hgengine/?rev=422&view=rev
Author: willmurnane
Date: 2009-07-15 01:59:15 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Translate repeated keys, too!
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-07-13 05:33:28 UTC (rev 421)
+++ Mercury2/src/X11Window.cpp 2009-07-15 01:59:15 UTC (rev 422)
@@ -243,7 +243,7 @@
{
//ignore autorepeat
if ( IsKeyRepeat(&event.xkey) ) break;
-
+
KeyboardInput::ProcessKeyInput( ConvertScancode( event.xkey.keycode ), true, false);
break;
}
@@ -298,7 +298,7 @@
nEvent.xkey.time == e->time)
{
XNextEvent(m_display, &nEvent); //forget next event
- KeyboardInput::ProcessKeyInput(e->keycode, true, true); //set repeat flag
+ KeyboardInput::ProcessKeyInput( ConvertScancode( e->keycode ), true, true ); //set repeat flag
return true;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <wil...@us...> - 2009-07-15 05:56:26
|
Revision: 427
http://hgengine.svn.sourceforge.net/hgengine/?rev=427&view=rev
Author: willmurnane
Date: 2009-07-15 05:56:24 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Update keyboard layout stuff to include all the keys, document what's what, etc
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-07-15 04:23:32 UTC (rev 426)
+++ Mercury2/src/X11Window.cpp 2009-07-15 05:56:24 UTC (rev 427)
@@ -22,18 +22,19 @@
{
switch( scanin )
{
- case 9: return 27; //esc
+ case 9: return 27; //esc
case 19: return '0';
- case 49: return 97; //`
+ case 49: return 97; //`
case 22: return 8; //backspace
case 95: return 292; //F11
case 96: return 293; //F12
- case 20: return 45; //-
- case 21: return 61; //=
- case 51: return 92; //backslash
- case 23: return 9; //tab
- case 50: return 160; //[lshift]
- case 62: return 161; //[rshift]
+ case 20: return 45; //-
+ case 21: return 61; //=
+ case 51: return 92; //backslash
+ case 23: return 9; //tab
+ case 66: return 15; //Caps lock
+ case 50: return 160; //[lshift]
+ case 62: return 161; //[rshift]
case 38: return 'a';
case 56: return 'b';
@@ -62,34 +63,61 @@
case 29: return 'y';
case 52: return 'z';
- case 34: return 91; //misc keys inbetween letters and enter
- case 35: return 93;
- case 47: return 59;
- case 48: return 39;
- case 59: return 44;
- case 60: return 46;
- case 61: return 47;
+ case 47: return 59; //;
+ case 48: return 39; //'
+ case 59: return 44; //,
+ case 60: return 46; //.
+ case 61: return 47; // /
- case 111: return 273; //arrow keys
- case 113: return 276;
- case 114: return 275;
- case 116: return 274;
+ case 111: return 273; //arrow keys: up
+ case 113: return 276; //arrow keys: left
+ case 114: return 275; //arrow keys: right
+ case 116: return 274; //arrow keys: down
- case 37: return 162; //ctrl, win, alt
- case 133: return 91;
- case 64: return 164;
+ case 37: return 162; //left ctrl
+ case 133: return 91; //left super (aka win)
+ case 64: return 164; //left alt
+ case 65: return 32; //space bar
+ case 108: return 165; //right alt
+ case 134: return 91; //right super (aka win)
+ case 135: return 93; //menu
+ case 105: return 268; //right control
- case 108: return 165; //RIGHT buttons like ctrl, sel, alt
- case 135: return 93;
- case 105: return 263;
-
- case 36: return 13;
- case 66: return 15;
-
+ case 107: return 316; //Print Screen
+ //case 78: scroll lock
+ case 127: return 19; //Pause
+ case 118: return 277; //Insert
+ case 110: return 278; //Home
+ case 112: return 280; //Page Up
+ case 119: return 127; //Delete
+ case 115: return 279; //End
+ case 117: return 181; //Page Down
+
+ //case 77: Num Lock (not mapped)
+ case 106: return 267; //Keypad /
+ case 63: return 268; //Keypad *
+ case 82: return 269; //Keypad -
+ case 79: return 263; //Keypad 7
+ case 80: return 264; //Keypad 8
+ case 81: return 265; //Keypad 9
+ case 86: return 270; //Keypad +
+ case 83: return 260; //Keypad 4
+ case 84: return 261; //Keypad 5
+ case 85: return 262; //Keypad 6
+ case 87: return 257; //Keypad 1
+ case 88: return 258; //Keypad 2
+ case 89: return 259; //Keypad 3
+ case 36: //Enter
+ case 104: return 13; //Keypad enter
+ case 90: return 260; //Keypad 0
+ case 91: return 266; //Keypad .
+
default:
+ // numbers
if( scanin >= 10 && scanin <= 18 )
return scanin + ( (short)'1' - 10 );
- if( scanin >= 67 && scanin <= 76 ) //f1-f10
+ // f1 -- f10
+ if( scanin >= 67 && scanin <= 76 )
return scanin + ( 282 - 67 );
return scanin;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-08-23 06:03:23
|
Revision: 517
http://hgengine.svn.sourceforge.net/hgengine/?rev=517&view=rev
Author: cnlohr
Date: 2009-08-23 06:03:15 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
fix X11 button receiving
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-08-23 05:24:34 UTC (rev 516)
+++ Mercury2/src/X11Window.cpp 2009-08-23 06:03:15 UTC (rev 517)
@@ -280,18 +280,14 @@
{
XButtonEvent* e = (XButtonEvent*)&event;
uint8_t left, right, center, su, sd;
- left = (e->state & X11_MASK(MOUSE_BTN_LEFT)) ^ (e->button == MOUSE_BTN_LEFT);
- right = (e->state & X11_MASK(MOUSE_BTN_RIGHT)) ^ (e->button == MOUSE_BTN_RIGHT);
- center = (e->state & X11_MASK(MOUSE_BTN_CENTER)) ^ (e->button == MOUSE_BTN_CENTER);
- su = (e->state & X11_MASK(MOUSE_BTN_SCROLL_UP)) ^ (e->button == MOUSE_BTN_SCROLL_UP);
- sd = (e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN)) ^ (e->button == MOUSE_BTN_SCROLL_DOWN);
-
- MouseInput::ProcessMouseInput(0, 0,
- e->state & X11_MASK(MOUSE_BTN_LEFT),
- e->state & X11_MASK(MOUSE_BTN_RIGHT),
- e->state & X11_MASK(MOUSE_BTN_CENTER),
- e->state & X11_MASK(MOUSE_BTN_SCROLL_UP),
- e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN));
+ left = (e->state & X11_MASK(MOUSE_BTN_LEFT))!=0 ^ (e->button == MOUSE_BTN_LEFT);
+ right = (e->state & X11_MASK(MOUSE_BTN_RIGHT))!=0 ^ (e->button == MOUSE_BTN_RIGHT);
+ center = (e->state & X11_MASK(MOUSE_BTN_CENTER))!=0 ^ (e->button == MOUSE_BTN_CENTER);
+ su = (e->state & X11_MASK(MOUSE_BTN_SCROLL_UP))!=0 ^ (e->button == MOUSE_BTN_SCROLL_UP);
+ sd = (e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN))!=0 ^ (e->button == MOUSE_BTN_SCROLL_DOWN);
+
+ MouseInput::ProcessMouseInput(e->x, e->y,
+ left, right, center, su, sd);
break;
}
case KeyPress:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-08-23 06:04:23
|
Revision: 518
http://hgengine.svn.sourceforge.net/hgengine/?rev=518&view=rev
Author: cnlohr
Date: 2009-08-23 06:04:16 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
fix warnings
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-08-23 06:03:15 UTC (rev 517)
+++ Mercury2/src/X11Window.cpp 2009-08-23 06:04:16 UTC (rev 518)
@@ -280,11 +280,11 @@
{
XButtonEvent* e = (XButtonEvent*)&event;
uint8_t left, right, center, su, sd;
- left = (e->state & X11_MASK(MOUSE_BTN_LEFT))!=0 ^ (e->button == MOUSE_BTN_LEFT);
- right = (e->state & X11_MASK(MOUSE_BTN_RIGHT))!=0 ^ (e->button == MOUSE_BTN_RIGHT);
- center = (e->state & X11_MASK(MOUSE_BTN_CENTER))!=0 ^ (e->button == MOUSE_BTN_CENTER);
- su = (e->state & X11_MASK(MOUSE_BTN_SCROLL_UP))!=0 ^ (e->button == MOUSE_BTN_SCROLL_UP);
- sd = (e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN))!=0 ^ (e->button == MOUSE_BTN_SCROLL_DOWN);
+ left = ((e->state & X11_MASK(MOUSE_BTN_LEFT))!=0) ^ (e->button == MOUSE_BTN_LEFT);
+ right = ((e->state & X11_MASK(MOUSE_BTN_RIGHT))!=0) ^ (e->button == MOUSE_BTN_RIGHT);
+ center = ((e->state & X11_MASK(MOUSE_BTN_CENTER))!=0) ^ (e->button == MOUSE_BTN_CENTER);
+ su = ((e->state & X11_MASK(MOUSE_BTN_SCROLL_UP))!=0) ^ (e->button == MOUSE_BTN_SCROLL_UP);
+ sd = ((e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN))!=0) ^ (e->button == MOUSE_BTN_SCROLL_DOWN);
MouseInput::ProcessMouseInput(e->x, e->y,
left, right, center, su, sd);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cn...@us...> - 2009-11-07 04:55:04
|
Revision: 603
http://hgengine.svn.sourceforge.net/hgengine/?rev=603&view=rev
Author: cnlohr
Date: 2009-11-07 04:54:56 +0000 (Sat, 07 Nov 2009)
Log Message:
-----------
don't make mouse move when clicking
Modified Paths:
--------------
Mercury2/src/X11Window.cpp
Modified: Mercury2/src/X11Window.cpp
===================================================================
--- Mercury2/src/X11Window.cpp 2009-11-06 06:45:08 UTC (rev 602)
+++ Mercury2/src/X11Window.cpp 2009-11-07 04:54:56 UTC (rev 603)
@@ -286,7 +286,7 @@
su = ((e->state & X11_MASK(MOUSE_BTN_SCROLL_UP))!=0) ^ (e->button == MOUSE_BTN_SCROLL_UP);
sd = ((e->state & X11_MASK(MOUSE_BTN_SCROLL_DOWN))!=0) ^ (e->button == MOUSE_BTN_SCROLL_DOWN);
- MouseInput::ProcessMouseInput(e->x, e->y,
+ MouseInput::ProcessMouseInput(0, 0,
left, right, center, su, sd);
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X