Nux

Merge lp:~yeganeh/nux/fix-for-754565 into lp:nux

Proposed by Zaid Yeganeh
Status: Merged
Merged at revision: 493
Proposed branch: lp:~yeganeh/nux/fix-for-754565
Merge into: lp:nux
Diff against target: 31 lines (+3/-0)
2 files modified
NuxGraphics/Gfx_Events.h (+1/-0)
NuxGraphics/GraphicsDisplayX11.cpp (+2/-0)
To merge this branch: bzr merge lp:~yeganeh/nux/fix-for-754565
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
Review via email: mp+77738@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) wrote :

Thank you for your patch! Before we can accept it, we require you to agree to inalogic's contributor agreement (http://inalogic.com/license). If you accept it, send and email to <email address hidden> and state that you agree.

Revision history for this message
Zaid Yeganeh (yeganeh) wrote :

Hi Jay - I've sent the agreement, but the URL you gave me doesn't seem correct. I found it here: http://inalogic.com/inalogic-contributor-agreement/. Thanks

Revision history for this message
Jay Taoko (jaytaoko) wrote :

Right! thanks for the notice!

Revision history for this message
Jay Taoko (jaytaoko) wrote :

Zaid

Your branch makes me realize that NuxGraphics/Gfx_Events.h is no longer needed in Nux. I will make the necessary changes and merge your branch.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NuxGraphics/Gfx_Events.h'
2--- NuxGraphics/Gfx_Events.h 2011-04-06 21:54:09 +0000
3+++ NuxGraphics/Gfx_Events.h 2011-09-30 16:57:23 +0000
4@@ -398,6 +398,7 @@
5 e_keysym = 0;
6 e_key_repeat_count = 0;
7 e_wheeldelta = 0;
8+ e_key_modifiers = 0;
9 }
10
11 unsigned long VirtualKeycodeState[NUX_MAX_VK];
12
13=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
14--- NuxGraphics/GraphicsDisplayX11.cpp 2011-09-28 12:02:57 +0000
15+++ NuxGraphics/GraphicsDisplayX11.cpp 2011-09-30 16:57:23 +0000
16@@ -1599,6 +1599,7 @@
17 m_pEvent->e_y = y_recalc;
18 m_pEvent->e_x_root = 0;
19 m_pEvent->e_y_root = 0;
20+ m_pEvent->e_key_modifiers = GetModifierKeyState (xevent.xkey.state);
21 mouse_press (xevent, m_pEvent);
22 //nuxDebugMsg(TEXT("[GraphicsDisplay::ProcessXEvents]: ButtonPress event."));
23 break;
24@@ -1616,6 +1617,7 @@
25 m_pEvent->e_y = y_recalc;
26 m_pEvent->e_x_root = 0;
27 m_pEvent->e_y_root = 0;
28+ m_pEvent->e_key_modifiers = GetModifierKeyState (xevent.xkey.state);
29 mouse_release (xevent, m_pEvent);
30 //nuxDebugMsg(TEXT("[GraphicsDisplay::ProcessXEvents]: ButtonRelease event."));
31 break;

Subscribers

People subscribed via source and target branches