m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the shift + click right mouse button emulation as it looks like is already handled with the apple key.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@272 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Franck Charlet 2008-10-16 23:07:26 +00:00
parent a453821325
commit 0f74b81151
5 changed files with 40 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

112
Grafx2.xcodeproj/xx.pbxuser
View File

@ -141,32 +141,29 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 245883613;
PBXWorkspaceStateSaveDate = 245883613;
PBXPerProjectTemplateStateSaveDate = 245890901;
PBXWorkspaceStateSaveDate = 245890901;
};
perUserProjectItems = {
F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */;
F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */;
F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */;
F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */ = F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */;
F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */ = F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */;
F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */ = F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */;
F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */ = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */;
F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */ = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */;
F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */ = F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */;
F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */ = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */;
F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */ = F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */;
F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */ = F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */;
F5B8B7700EA7E20300214777 /* PBXTextBookmark */ = F5B8B7700EA7E20300214777 /* PBXTextBookmark */;
F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */;
F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */;
F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */;
F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */;
F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */;
F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */;
F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */;
F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */;
F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */;
F5B19C160EA4D6E8003F4BA4 = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */;
F5B19C180EA4D6E8003F4BA4 = F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */;
F5B19C1A0EA4D6E8003F4BA4 = F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */;
F5B19C2F0EA4DB23003F4BA4 = F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */;
F5B19C300EA4DB23003F4BA4 = F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */;
F5B19C310EA4DB36003F4BA4 = F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */;
F5B1D1770EA5FE2100AB8D0F = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */;
F5B1D1790EA5FE2100AB8D0F = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */;
F5B1D1B50EA602BA00AB8D0F = F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */;
F5B1D1B70EA602BA00AB8D0F = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */;
F5B1D1BD0EA602C300AB8D0F = F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */;
F5B1D1CA0EA602F600AB8D0F = F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */;
F5B8B7890EA7EE9F00214777 = F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */;
F5B8B7960EA7EE9F00214777 = F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */;
F5B8B7A30EA7F2AA00214777 = F5B8B7A30EA7F2AA00214777 /* PBXTextBookmark */;
F5DCE26A0EA50EDC0065B0EF = F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */;
F5DCE26B0EA50EDC0065B0EF = F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */;
F5DCE26C0EA50EDC0065B0EF = F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */;
F5DCE26E0EA50EDC0065B0EF = F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */;
};
sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
userBuildSettings = {
@ -426,16 +423,6 @@
vrLen = 170;
vrLoc = 0;
};
F5B8B7700EA7E20300214777 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
name = "graph.c: 6111";
rLen = 0;
rLoc = 204170;
rType = 0;
vrLen = 0;
vrLoc = 0;
};
F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
@ -446,42 +433,6 @@
vrLen = 0;
vrLoc = 0;
};
F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B8B7910EA7EE9F00214777 /* SDL_keysym.h */;
rLen = 0;
rLoc = 2147483647;
rType = 0;
};
F5B8B7910EA7EE9F00214777 /* SDL_keysym.h */ = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.c.h;
name = SDL_keysym.h;
path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h;
sourceTree = "<absolute>";
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {867, 5928}}";
sepNavSelRange = "{2619, 11}";
sepNavVisRect = "{{0, 1704}, {867, 536}}";
sepNavWindowFrame = "{{38, -28}, {906, 665}}";
};
};
F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B8B7930EA7EE9F00214777 /* SDL_keysym.h */;
name = SDLK_DELETE;
rLen = 11;
rLoc = 2619;
rType = 0;
vrLen = 559;
vrLoc = 2295;
};
F5B8B7930EA7EE9F00214777 /* SDL_keysym.h */ = {
isa = PBXFileReference;
name = SDL_keysym.h;
path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h;
sourceTree = "<absolute>";
};
F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B8B7970EA7EE9F00214777 /* SDL_keyboard.h */;
@ -495,25 +446,16 @@
name = SDL_keyboard.h;
path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h;
sourceTree = "<absolute>";
uiCtxt = {
sepNavWindowFrame = "{{15, 76}, {906, 665}}";
};
};
F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */ = {
F5B8B7A30EA7F2AA00214777 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B8B7990EA7EE9F00214777 /* SDL_keyboard.h */;
name = "(null): 1";
fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
name = "graph.c: Tourner_brosse_preview";
rLen = 0;
rLoc = 0;
rLoc = 204170;
rType = 0;
vrLen = 961;
vrLoc = 1042;
};
F5B8B7990EA7EE9F00214777 /* SDL_keyboard.h */ = {
isa = PBXFileReference;
name = SDL_keyboard.h;
path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h;
sourceTree = "<absolute>";
vrLen = 0;
vrLoc = 0;
};
F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */ = {
isa = PBXTextBookmark;

69
Grafx2.xcodeproj/xx.perspective
View File

@ -186,46 +186,6 @@
<array/>
<key>OpenEditors</key>
<array>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>F5B8B78E0EA7EE9F00214777</string>
<key>PBXProjectModuleLabel</key>
<string>SDL_keysym.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>F5B8B78F0EA7EE9F00214777</string>
<key>PBXProjectModuleLabel</key>
<string>SDL_keysym.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>F5B8B7920EA7EE9F00214777</string>
<key>history</key>
<array>
<string>F5B8B7900EA7EE9F00214777</string>
</array>
</dict>
<key>SplitCount</key>
<string>1</string>
</dict>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>Geometry</key>
<dict>
<key>Frame</key>
<string>{{0, 20}, {906, 568}}</string>
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>38 28 906 609 0 0 1024 746 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
@ -241,10 +201,6 @@
<string>F5B8B7950EA7EE9F00214777</string>
<key>PBXProjectModuleLabel</key>
<string>SDL_keyboard.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>F5B8B7980EA7EE9F00214777</string>
<key>history</key>
<array>
<string>F5B8B7960EA7EE9F00214777</string>
@ -405,7 +361,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>F5B8B7890EA7EE9F00214777</string>
<string>F5B8B7A30EA7F2AA00214777</string>
<key>history</key>
<array>
<string>F5B19C160EA4D6E8003F4BA4</string>
@ -414,7 +370,7 @@
<string>F5DCE26C0EA50EDC0065B0EF</string>
<string>F5B1D1770EA5FE2100AB8D0F</string>
<string>F5B1D1B50EA602BA00AB8D0F</string>
<string>F5B8B7700EA7E20300214777</string>
<string>F5B8B7890EA7EE9F00214777</string>
</array>
<key>prevStack</key>
<array>
@ -520,11 +476,11 @@
</array>
<key>TableOfContents</key>
<array>
<string>F5B8B7780EA7E2E200214777</string>
<string>F5B8B7A40EA7F2AA00214777</string>
<string>1CA23ED40692098700951B8B</string>
<string>F5B8B7790EA7E2E200214777</string>
<string>F5B8B7A50EA7F2AA00214777</string>
<string>F5B19BA70EA4BF24003F4BA4</string>
<string>F5B8B77A0EA7E2E200214777</string>
<string>F5B8B7A60EA7F2AA00214777</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@ -593,7 +549,7 @@
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 0}, {970, 262}}</string>
<string>{{0, 0}, {0, 0}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@ -671,7 +627,7 @@
</dict>
<dict>
<key>Proportion</key>
<string>108pt</string>
<string>0pt</string>
<key>Tabs</key>
<array>
<dict>
@ -689,7 +645,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {0, 81}}</string>
<string>{{10, 27}, {0, -27}}</string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
@ -769,14 +725,14 @@
</array>
<key>TableOfContents</key>
<array>
<string>F5B8B78A0EA7EE9F00214777</string>
<string>F5B8B7A70EA7F2AA00214777</string>
<string>1CA23EE50692099D00951B8B</string>
<string>F5B8B78B0EA7EE9F00214777</string>
<string>F5B8B7A80EA7F2AA00214777</string>
<string>F5B19BA70EA4BF24003F4BA4</string>
<string>F5B8B78C0EA7EE9F00214777</string>
<string>F5B8B7A90EA7F2AA00214777</string>
<string>XCMainBuildResultsModuleGUID</string>
<string>1CA23EE80692099D00951B8B</string>
<string>F5B8B78D0EA7EE9F00214777</string>
<string>F5B8B7AA0EA7F2AA00214777</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.buildAndRun</string>
@ -945,7 +901,6 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>F5B8B78E0EA7EE9F00214777</string>
<string>/Users/xx/Grafx2/Grafx2.xcodeproj</string>
</array>
<key>WindowString</key>

2
const.h
View File

@ -29,7 +29,7 @@
#define M_2PI 6.28318530717958647692528676656
// Note: La taille du fichier GFX2.DAT est définie au début de INIT.C !
#define POURCENTAGE_VERSION "97.4%" // Libellé du pourcentage de la version ß
#define POURCENTAGE_VERSION "97.5%" // Libellé du pourcentage de la version ß
#define VERSION1 2 // |
#define VERSION2 0 // |_ Numéro de version découpé en
#define BETA1 97 // | plusieurs parties => 2.0 ß95.5%

13
divers.c
View File

@ -161,20 +161,7 @@ void Get_input(void)
//Clic sur un des boutons de la souris
switch(event.button.button)
{
#ifdef __macosx__
// fc: poor poor mac users with a single button mouse...
// emulated with the shifts keys
case SDL_BUTTON_LEFT:
INPUT_Nouveau_Mouse_K = 1;
if(SDL_GetModState() & KMOD_LSHIFT ||
SDL_GetModState() & KMOD_RSHIFT)
{
INPUT_Nouveau_Mouse_K = 2;
}
break;
#else
case SDL_BUTTON_LEFT: INPUT_Nouveau_Mouse_K = 1; break;
#endif
case SDL_BUTTON_MIDDLE: // Pour SDL, 2 = clic milieu. Pour nous c'est le clic droit
case SDL_BUTTON_RIGHT: // Clic droit SDL, clic droit pour nous aussi ( pour le moment en tout cas)
INPUT_Nouveau_Mouse_K = 2;