Revision: 30616
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30616
Author:   merwin
Date:     2010-07-22 09:10:57 +0200 (Thu, 22 Jul 2010)

Log Message:
-----------
removed more unused Macintosh Carbon code

Removed Paths:
-------------
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCarbon.h

Deleted: branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCarbon.cpp 
2010-07-22 07:07:28 UTC (rev 30615)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_SystemCarbon.cpp 
2010-07-22 07:10:57 UTC (rev 30616)
@@ -1,1236 +0,0 @@
-/**
- * $Id$
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/**
-
- * $Id$
- * Copyright (C) 2001 NaN Technologies B.V.
- * @author     Maarten Gribnau
- * @date       May 7, 2001
- */
-
-#include <Carbon/Carbon.h>
-#include <ApplicationServices/ApplicationServices.h>
-#include "GHOST_SystemCarbon.h"
-
-#include "GHOST_DisplayManagerCarbon.h"
-#include "GHOST_EventKey.h"
-#include "GHOST_EventButton.h"
-#include "GHOST_EventCursor.h"
-#include "GHOST_EventWheel.h"
-#include "GHOST_EventNDOF.h"
-
-#include "GHOST_TimerManager.h"
-#include "GHOST_TimerTask.h"
-#include "GHOST_WindowManager.h"
-#include "GHOST_WindowCarbon.h"
-#include "GHOST_NDOFManager.h"
-#include "AssertMacros.h"
-
-#define GHOST_KEY_SWITCH(mac, ghost) { case (mac): ghostKey = (ghost); break; }
-
-/* blender class and types events */
-enum {
-  kEventClassBlender              = 'blnd'
-};
-
-enum {
-       kEventBlenderNdofAxis                   = 1,
-       kEventBlenderNdofButtons                = 2
-};
-
-const EventTypeSpec    kEvents[] =
-{
-       { kEventClassAppleEvent, kEventAppleEvent },
-/*
-       { kEventClassApplication, kEventAppActivated },
-       { kEventClassApplication, kEventAppDeactivated },
-*/     
-       { kEventClassKeyboard, kEventRawKeyDown },
-       { kEventClassKeyboard, kEventRawKeyRepeat },
-       { kEventClassKeyboard, kEventRawKeyUp },
-       { kEventClassKeyboard, kEventRawKeyModifiersChanged },
-       
-       { kEventClassMouse, kEventMouseDown },
-       { kEventClassMouse, kEventMouseUp },
-       { kEventClassMouse, kEventMouseMoved },
-       { kEventClassMouse, kEventMouseDragged },
-       { kEventClassMouse, kEventMouseWheelMoved },
-       
-       { kEventClassWindow, kEventWindowClickZoomRgn } ,  /* for new zoom 
behaviour */ 
-       { kEventClassWindow, kEventWindowZoom },  /* for new zoom behaviour */ 
-       { kEventClassWindow, kEventWindowExpand } ,  /* for new zoom behaviour 
*/ 
-       { kEventClassWindow, kEventWindowExpandAll },  /* for new zoom 
behaviour */ 
-
-       { kEventClassWindow, kEventWindowClose },
-       { kEventClassWindow, kEventWindowActivated },
-       { kEventClassWindow, kEventWindowDeactivated },
-       { kEventClassWindow, kEventWindowUpdate },
-       { kEventClassWindow, kEventWindowBoundsChanged },
-       
-       { kEventClassBlender, kEventBlenderNdofAxis },
-       { kEventClassBlender, kEventBlenderNdofButtons }
-       
-       
-       
-};
-
-
-
-static GHOST_TButtonMask convertButton(EventMouseButton button)
-{
-       switch (button) {
-       case kEventMouseButtonPrimary:
-               return GHOST_kButtonMaskLeft;
-       case kEventMouseButtonSecondary:
-               return GHOST_kButtonMaskRight;
-       case kEventMouseButtonTertiary:
-       default:
-               return GHOST_kButtonMaskMiddle;
-       }
-}
-
-static GHOST_TKey convertKey(int rawCode) 
-{      
-               /* This bit of magic converts the rawCode into a virtual
-                * Mac key based on the current keyboard mapping, but
-                * without regard to the modifiers (so we don't get 'a' 
-                * and 'A' for example.
-                */
-       static UInt32 dummy= 0;
-       Handle transData = (Handle) GetScriptManagerVariable(smKCHRCache);
-       unsigned char vk = KeyTranslate(transData, rawCode, &dummy);    
-               /* Map numpad based on rawcodes first, otherwise they
-                * look like non-numpad events.
-                * Added too: mapping the number keys, for french keyboards etc 
(ton)
-                */
-       // printf("GHOST: vk: %d %c raw: %d\n", vk, vk, rawCode);
-                
-       switch (rawCode) {
-       case 18:        return GHOST_kKey1;
-       case 19:        return GHOST_kKey2;
-       case 20:        return GHOST_kKey3;
-       case 21:        return GHOST_kKey4;
-       case 23:        return GHOST_kKey5;
-       case 22:        return GHOST_kKey6;
-       case 26:        return GHOST_kKey7;
-       case 28:        return GHOST_kKey8;
-       case 25:        return GHOST_kKey9;
-       case 29:        return GHOST_kKey0;
-       
-       case 82:        return GHOST_kKeyNumpad0;
-       case 83:        return GHOST_kKeyNumpad1;
-       case 84:        return GHOST_kKeyNumpad2;
-       case 85:        return GHOST_kKeyNumpad3;
-       case 86:        return GHOST_kKeyNumpad4;
-       case 87:        return GHOST_kKeyNumpad5;
-       case 88:        return GHOST_kKeyNumpad6;
-       case 89:        return GHOST_kKeyNumpad7;
-       case 91:        return GHOST_kKeyNumpad8;
-       case 92:        return GHOST_kKeyNumpad9;
-       case 65:        return GHOST_kKeyNumpadPeriod;
-       case 76:        return GHOST_kKeyNumpadEnter;
-       case 69:        return GHOST_kKeyNumpadPlus;
-       case 78:        return GHOST_kKeyNumpadMinus;
-       case 67:        return GHOST_kKeyNumpadAsterisk;
-       case 75:        return GHOST_kKeyNumpadSlash;
-       }
-       
-       if ((vk >= 'a') && (vk <= 'z')) {
-               return (GHOST_TKey) (vk - 'a' + GHOST_kKeyA);
-       } else if ((vk >= '0') && (vk <= '9')) {
-               return (GHOST_TKey) (vk - '0' + GHOST_kKey0);
-       } else if (vk==16) {
-               switch (rawCode) {
-               case 122:       return GHOST_kKeyF1;
-               case 120:       return GHOST_kKeyF2;
-               case 99:        return GHOST_kKeyF3;
-               case 118:       return GHOST_kKeyF4;
-               case 96:        return GHOST_kKeyF5;
-               case 97:        return GHOST_kKeyF6;
-               case 98:        return GHOST_kKeyF7;
-               case 100:       return GHOST_kKeyF8;
-               case 101:       return GHOST_kKeyF9;
-               case 109:       return GHOST_kKeyF10;
-               case 103:       return GHOST_kKeyF11;
-               case 111:       return GHOST_kKeyF12;  // Never get, is used 
for ejecting the CD! 
-               }
-       } else {
-               switch (vk) {
-               case kUpArrowCharCode:          return GHOST_kKeyUpArrow;
-               case kDownArrowCharCode:        return GHOST_kKeyDownArrow;
-               case kLeftArrowCharCode:        return GHOST_kKeyLeftArrow;
-               case kRightArrowCharCode:       return GHOST_kKeyRightArrow;
-
-               case kReturnCharCode:           return GHOST_kKeyEnter;
-               case kBackspaceCharCode:        return GHOST_kKeyBackSpace;
-               case kDeleteCharCode:           return GHOST_kKeyDelete;
-               case kEscapeCharCode:           return GHOST_kKeyEsc;
-               case kTabCharCode:                      return GHOST_kKeyTab;
-               case kSpaceCharCode:            return GHOST_kKeySpace;
-
-               case kHomeCharCode:             return GHOST_kKeyHome;
-               case kEndCharCode:                      return GHOST_kKeyEnd;
-               case kPageUpCharCode:           return GHOST_kKeyUpPage;
-               case kPageDownCharCode:         return GHOST_kKeyDownPage;
-
-               case '-':       return GHOST_kKeyMinus;
-               case '=':       return GHOST_kKeyEqual;
-               case ',':       return GHOST_kKeyComma;
-               case '.':       return GHOST_kKeyPeriod;
-               case '/':       return GHOST_kKeySlash;
-               case ';':       return GHOST_kKeySemicolon;
-               case '\'':      return GHOST_kKeyQuote;
-               case '\\':      return GHOST_kKeyBackslash;
-               case '[':       return GHOST_kKeyLeftBracket;
-               case ']':       return GHOST_kKeyRightBracket;
-               case '`':       return GHOST_kKeyAccentGrave;
-               }
-       }
-       
-       // printf("GHOST: unknown key: %d %d\n", vk, rawCode);
-       
-       return GHOST_kKeyUnknown;
-}
-
-/* MacOSX returns a Roman charset with kEventParamKeyMacCharCodes
- * as defined here: 
http://developer.apple.com/documentation/mac/Text/Text-516.html
- * I am not sure how international this works...
- * For cross-platform convention, we'll use the Latin ascii set instead.
- * As defined at: http://www.ramsch.org/martin/uni/fmi-hp/iso8859-1.html
- * 
- */
-static unsigned char convertRomanToLatin(unsigned char ascii)
-{
-
-       if(ascii<128) return ascii;
-       
-       switch(ascii) {
-       case 128:       return 142;
-       case 129:       return 143;
-       case 130:       return 128;
-       case 131:       return 201;
-       case 132:       return 209;
-       case 133:       return 214;
-       case 134:       return 220;
-       case 135:       return 225;
-       case 136:       return 224;
-       case 137:       return 226;
-       case 138:       return 228;
-       case 139:       return 227;
-       case 140:       return 229;
-       case 141:       return 231;
-       case 142:       return 233;
-       case 143:       return 232;
-       case 144:       return 234;
-       case 145:       return 235;
-       case 146:       return 237;
-       case 147:       return 236;
-       case 148:       return 238;
-       case 149:       return 239;
-       case 150:       return 241;
-       case 151:       return 243;
-       case 152:       return 242;
-       case 153:       return 244;
-       case 154:       return 246;
-       case 155:       return 245;
-       case 156:       return 250;
-       case 157:       return 249;
-       case 158:       return 251;
-       case 159:       return 252;
-       case 160:       return 0;
-       case 161:       return 176;
-       case 162:       return 162;
-       case 163:       return 163;
-       case 164:       return 167;
-       case 165:       return 183;
-       case 166:       return 182;
-       case 167:       return 223;
-       case 168:       return 174;
-       case 169:       return 169;
-       case 170:       return 174;
-       case 171:       return 180;
-       case 172:       return 168;
-       case 173:       return 0;
-       case 174:       return 198;
-       case 175:       return 216;
-       case 176:       return 0;
-       case 177:       return 177;
-       case 178:       return 0;
-       case 179:       return 0;
-       case 180:       return 165;
-       case 181:       return 181;
-       case 182:       return 0;
-       case 183:       return 0;
-       case 184:       return 215;
-       case 185:       return 0;
-       case 186:       return 0;
-       case 187:       return 170;
-       case 188:       return 186;
-       case 189:       return 0;
-       case 190:       return 230;
-       case 191:       return 248;
-       case 192:       return 191;
-       case 193:       return 161;
-       case 194:       return 172;
-       case 195:       return 0;
-       case 196:       return 0;
-       case 197:       return 0;
-       case 198:       return 0;
-       case 199:       return 171;
-       case 200:       return 187;
-       case 201:       return 201;
-       case 202:       return 0;
-       case 203:       return 192;
-       case 204:       return 195;
-       case 205:       return 213;
-       case 206:       return 0;
-       case 207:       return 0;
-       case 208:       return 0;
-       case 209:       return 0;
-       case 210:       return 0;
-       
-       case 214:       return 247;
-
-       case 229:       return 194;
-       case 230:       return 202;
-       case 231:       return 193;
-       case 232:       return 203;
-       case 233:       return 200;
-       case 234:       return 205;
-       case 235:       return 206;
-       case 236:       return 207;
-       case 237:       return 204;
-       case 238:       return 211;
-       case 239:       return 212;
-       case 240:       return 0;
-       case 241:       return 210;
-       case 242:       return 218;
-       case 243:       return 219;
-       case 244:       return 217;
-       case 245:       return 0;
-       case 246:       return 0;
-       case 247:       return 0;
-       case 248:       return 0;
-       case 249:       return 0;
-       case 250:       return 0;
-
-       
-               default: return 0;
-       }
-
-}
-
-
-/***/
-
-GHOST_SystemCarbon::GHOST_SystemCarbon() :

@@ Diff output truncated at 10240 characters. @@

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to