![(please configure the [header_logo] section in trac.ini)](/share/chrome/site/your_project_logo.png){kind=logo}
Changeset 36273
- Timestamp:
- 12/26/09 04:32:29 (3 years ago)
- Location:
- lang/objective-cplusplus/i3/trunk
- Files:
-
- 8 modified
-
Makefile.am (modified) (1 diff)
-
po/POTFILES.in (modified) (1 diff)
-
scripts/POTFILES.in.sh (modified) (1 diff)
-
src/Common.cpp (modified) (1 diff)
-
src/Tester.cpp (modified) (3 diffs)
-
src/gui-windows/InputWindowPlatform.cpp (modified) (1 diff)
-
src/mil/include/mil/Serial.h (modified) (2 diffs)
-
tmp/main5.cpp (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
lang/objective-cplusplus/i3/trunk/Makefile.am
r36259 r36273 113 113 if WITH_GUI_COCOA 114 114 bin_PROGRAMS += coco 115 coco_SOURCES = tmp/ nc.cpp115 coco_SOURCES = tmp/main5.cpp 116 116 coco_CXXFLAGS = ${i3_CXXFLAGS} 117 117 coco_LDFLAGS = ${i3_LDFLAGS} -
lang/objective-cplusplus/i3/trunk/po/POTFILES.in
r36267 r36273 1 ../src/Common.h2 ../src/CompletionWindow.h3 ../src/ConfigFile.h4 ../src/Delegate.h5 ../src/Initial.h6 ../src/InputWindow.h7 ../src/Mediator.h8 ../src/OutputWindow.h9 ../src/PrecompiledHeaders.h10 ../src/ShellManager.h11 ../src/TestInputWindow1.h12 ../src/Tester.h13 ../src/Version.h14 ../src/gui-cocoa/CompletionWindowPlatform.h15 ../src/gui-cocoa/Gui.h16 ../src/gui-cocoa/InputWindowPlatform.h17 ../src/gui-cocoa/OutputWindowPlatform.h18 ../src/gui-windows/CompletionWindowPlatform.h19 ../src/gui-windows/Gui.h20 ../src/gui-windows/InputWindowPlatform.h21 ../src/gui-windows/OutputWindowPlatform.h22 ../src/mil/include/mil/Atomic.h23 ../src/mil/include/mil/Debug.h24 ../src/mil/include/mil/DoubleBuffer.h25 ../src/mil/include/mil/Environment.h26 ../src/mil/include/mil/FilterException.h27 ../src/mil/include/mil/GuiModule.h28 ../src/mil/include/mil/Intl.h29 ../src/mil/include/mil/Memory.h30 ../src/mil/include/mil/Mil.h31 ../src/mil/include/mil/Module.h32 ../src/mil/include/mil/ModuleCommon.h33 ../src/mil/include/mil/MscCrt.h34 ../src/mil/include/mil/PrecompiledHeaders.h35 ../src/mil/include/mil/Serial.h36 ../src/mil/include/mil/Synchronize.h37 ../src/mil/include/mil/Thread.h38 ../src/mil/include/mil/gui-cocoa/Gui.h39 ../src/mil/include/mil/gui-cocoa/GuiModule.h40 ../src/mil/include/mil/gui-cocoa/GuiModuleObjC.h41 ../src/mil/include/mil/gui-cocoa/PrecompiledHeaders.h42 ../src/mil/include/mil/gui-windows/DummyMessageHandler-inl.h43 ../src/mil/include/mil/gui-windows/Gui.h44 ../src/mil/include/mil/gui-windows/GuiModule.h45 ../src/mil/include/mil/gui-windows/MessageCracker-inl.h46 ../src/mil/include/mil/gui-windows/PrecompiledHeaders.h47 ../src/mil/include/mil/gui-windows/WindowProcedureRedirector.h48 ../src/mil/include/mil/os-unix/Debug.h49 ../src/mil/include/mil/os-unix/Os.h50 ../src/mil/include/mil/os-unix/PrecompiledHeaders.h51 ../src/mil/include/mil/os-unix/Thread.h52 ../src/mil/include/mil/os-windows/Common.h53 ../src/mil/include/mil/os-windows/Debug.h54 ../src/mil/include/mil/os-windows/Os.h55 ../src/mil/include/mil/os-windows/PrecompiledHeaders.h56 ../src/mil/include/mil/os-windows/Sleep.h57 ../src/mil/include/mil/os-windows/Thread.h58 ../src/mil/include/quicktest/quicktest.h59 ../src/mil/include/xbyak/xbyak.h60 ../src/mil/include/xbyak/xbyak_bin2hex.h61 ../src/mil/include/xbyak/xbyak_mnemonic.h62 ../src/mil/src/profile/Profile.h63 ../src/mil/src/test/Test.h64 ../src/os-unix/Os.h65 ../src/os-unix/Pty.h66 ../src/os-windows/Os.h67 ../src/os-windows/Pty.h68 ../src/os-windows/Utf8ToUtf16Stream.h69 ../src/os-windows/WindowsCommon.h70 ../src/os-windows/msvc/iconv.h71 ../src/os-windows/msvc/libintl.h72 ../src/os-windows/resources/resource.h73 ../src/os-windows/wlibintl.h1 src/Common.h 2 src/CompletionWindow.h 3 src/ConfigFile.h 4 src/Delegate.h 5 src/Initial.h 6 src/InputWindow.h 7 src/Mediator.h 8 src/OutputWindow.h 9 src/PrecompiledHeaders.h 10 src/ShellManager.h 11 src/TestInputWindow1.h 12 src/Tester.h 13 src/Version.h 14 src/gui-cocoa/CompletionWindowPlatform.h 15 src/gui-cocoa/Gui.h 16 src/gui-cocoa/InputWindowPlatform.h 17 src/gui-cocoa/OutputWindowPlatform.h 18 src/gui-windows/CompletionWindowPlatform.h 19 src/gui-windows/Gui.h 20 src/gui-windows/InputWindowPlatform.h 21 src/gui-windows/OutputWindowPlatform.h 22 src/mil/include/mil/Atomic.h 23 src/mil/include/mil/Debug.h 24 src/mil/include/mil/DoubleBuffer.h 25 src/mil/include/mil/Environment.h 26 src/mil/include/mil/FilterException.h 27 src/mil/include/mil/GuiModule.h 28 src/mil/include/mil/Intl.h 29 src/mil/include/mil/Memory.h 30 src/mil/include/mil/Mil.h 31 src/mil/include/mil/Module.h 32 src/mil/include/mil/ModuleCommon.h 33 src/mil/include/mil/MscCrt.h 34 src/mil/include/mil/PrecompiledHeaders.h 35 src/mil/include/mil/Serial.h 36 src/mil/include/mil/Synchronize.h 37 src/mil/include/mil/Thread.h 38 src/mil/include/mil/gui-cocoa/Gui.h 39 src/mil/include/mil/gui-cocoa/GuiModule.h 40 src/mil/include/mil/gui-cocoa/GuiModuleObjC.h 41 src/mil/include/mil/gui-cocoa/PrecompiledHeaders.h 42 src/mil/include/mil/gui-windows/DummyMessageHandler-inl.h 43 src/mil/include/mil/gui-windows/Gui.h 44 src/mil/include/mil/gui-windows/GuiModule.h 45 src/mil/include/mil/gui-windows/MessageCracker-inl.h 46 src/mil/include/mil/gui-windows/PrecompiledHeaders.h 47 src/mil/include/mil/gui-windows/WindowProcedureRedirector.h 48 src/mil/include/mil/os-unix/Debug.h 49 src/mil/include/mil/os-unix/Os.h 50 src/mil/include/mil/os-unix/PrecompiledHeaders.h 51 src/mil/include/mil/os-unix/Thread.h 52 src/mil/include/mil/os-windows/Common.h 53 src/mil/include/mil/os-windows/Debug.h 54 src/mil/include/mil/os-windows/Os.h 55 src/mil/include/mil/os-windows/PrecompiledHeaders.h 56 src/mil/include/mil/os-windows/Sleep.h 57 src/mil/include/mil/os-windows/Thread.h 58 src/mil/include/quicktest/quicktest.h 59 src/mil/include/xbyak/xbyak.h 60 src/mil/include/xbyak/xbyak_bin2hex.h 61 src/mil/include/xbyak/xbyak_mnemonic.h 62 src/mil/src/profile/Profile.h 63 src/mil/src/test/Test.h 64 src/os-unix/Os.h 65 src/os-unix/Pty.h 66 src/os-windows/Os.h 67 src/os-windows/Pty.h 68 src/os-windows/Utf8ToUtf16Stream.h 69 src/os-windows/WindowsCommon.h 70 src/os-windows/msvc/iconv.h 71 src/os-windows/msvc/libintl.h 72 src/os-windows/resources/resource.h 73 src/os-windows/wlibintl.h -
lang/objective-cplusplus/i3/trunk/scripts/POTFILES.in.sh
r36264 r36273 1 1 # -*- coding: utf-8-unix -*- 2 2 3 cd po 3 rm -f po/POTFILES.in.tmp po/POTFILES.in 4 4 5 rm -f POTFILES.in.tmp POTFILES.in 5 find src -type f -name '*.h' | sort >> po/POTFILES.in.tmp 6 find src -type f -name '\.c' | sort >> po/POTFILES.in.tmp 7 find src -type f -name '\.cpp' | sort >> po/POTFILES.in.tmp 8 find src -type f -name '\.m' | sort >> po/POTFILES.in.tmp 9 find src -type f -name '\.mm' | sort >> po/POTFILES.in.tmp 6 10 7 find ../src -type f -name '*.h' | sort >> POTFILES.in.tmp 8 find ../src -type f -name '\.c' | sort >> POTFILES.in.tmp 9 find ../src -type f -name '\.cpp' | sort >> POTFILES.in.tmp 10 find ../src -type f -name '\.m' | sort >> POTFILES.in.tmp 11 find ../src -type f -name '\.mm' | sort >> POTFILES.in.tmp 11 cp -p po/POTFILES.in.tmp po/POTFILES.in 12 rm -f po/POTFILES.in.tmp 12 13 13 cp -p POTFILES.in.tmp POTFILES.in14 rm -f POTFILES.in.tmp15 -
lang/objective-cplusplus/i3/trunk/src/Common.cpp
r36264 r36273 3 3 4 4 #include <mil/StaticData.cpp> 5 6 #ifdef MIL_GUI_COCOA7 #include <mil/StaticDataObjC.cpp>8 #endif9 5 10 6 #ifdef __CYGWIN__ -
lang/objective-cplusplus/i3/trunk/src/Tester.cpp
r36257 r36273 31 31 CHECK_VALID; 32 32 33 //std::cout << "Test [" << getName() << "] passed" << std::endl;34 33 synchronized (mutex) { 35 34 passed = true; … … 58 57 } 59 58 if (!startNext()) { 60 //debug << "run() return";61 59 return; 62 60 } … … 115 113 } 116 114 } 115 #else 116 void send_key(char c_); 117 117 #endif 118 118 -
lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.cpp
r36257 r36273 74 74 } 75 75 76 #define I3_EVENT_HANDLER(receiver_class, event_class) \ 77 template <> \ 78 void receiver_class::beforeExecute(event_class& event) { \ 79 debug << "r=" << #receiver_class << ", e=" << #event_class; \ 80 } \ 81 template <> \ 82 void receiver_class::execute(event_class& event) 83 76 84 struct EditChangedEvent { 77 85 int serial; 78 86 }; 79 87 80 template <> 81 void Delegate::execute(EditChangedEvent& e) { 88 //template <> 89 //void Delegate::execute(EditChangedEvent& e) { 90 91 I3_EVENT_HANDLER(Delegate, EditChangedEvent) { 82 92 //MessageBox(NULL, data, data, MB_OK); 83 93 HICON new_icon = NULL; -
lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Serial.h
r34792 r36273 16 16 int max; 17 17 int serial; 18 std::list<int> list;18 void* list_; // avoid compiler's segv 19 19 public: 20 20 Serial(int max) : max(max), serial(0) { 21 list_ = reinterpret_cast<void*>(new std::list<int>()); 21 22 } 23 24 ~Serial() { 25 delete reinterpret_cast<std::list<int>*>(list_); 26 } 27 22 28 int retain() { 23 29 int new_id = INVALID_VALUE; 24 30 synchronized (mutex) { 31 std::list<int>& list = *reinterpret_cast<std::list<int>*>(list_); 25 32 try { 26 33 if (!list.empty()) { … … 45 52 bool release(int v) { 46 53 synchronized (mutex) { 54 std::list<int>& list = *reinterpret_cast<std::list<int>*>(list_); 47 55 try { 48 56 list.push_back(v); -
lang/objective-cplusplus/i3/trunk/tmp/main5.cpp
r36248 r36273 1 #include <mil/PrecompiledHeaders.h> 2 #include <mil/Synchronize.h> 3 #include <mil/Thread.h> 1 #import <Cocoa/Cocoa.h> 2 #include <unistd.h> 3 4 #ifdef WIN32 5 #include <windows.h> 6 int get_native_thread_id() { 7 return GetCurrentThreadId(); 8 } 9 #else 10 int get_native_thread_id() { 11 return pthread_self(); 12 } 13 #endif 4 14 5 15 NSPort* port1 = nil; 6 16 NSPort* port2 = nil; 7 17 8 @interface WorkerObj: NSObject {18 @interface MyThread : NSObject { 9 19 } 10 20 - (oneway void)someInt:(int)foo; 11 21 - (void)setupServer:(NSNotification*)notification; 22 - (void)startThread; 12 23 @end 13 24 14 @implementation WorkerObj25 @implementation MyThread 15 26 - (oneway void)someInt:(int)arg { 16 NSLog(@"someInt thread=%x, arg=%x", pthread_self(), arg);27 NSLog(@"someInt thread=%x, arg=%x", get_native_thread_id(), arg); 17 28 } 18 29 - (void)setupServer:(NSNotification*)notification { 19 NSLog(@"setupServer thread=%x", pthread_self()); 20 21 port1 = [NSPort port]; 22 port2 = [NSPort port]; 30 NSLog(@"setupServer thread=%x", get_native_thread_id()); 23 31 24 32 NSConnection *serverConnection = … … 28 36 [serverConnection setRootObject:self]; 29 37 } 30 @end31 38 32 @interface MyThread : NSObject {33 }34 - (void)startThread;35 @end36 37 @implementation MyThread38 39 - (void)startThread { 39 40 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; 40 NSLog(@"startThread %x", pthread_self());41 NSLog(@"startThread %x", get_native_thread_id()); 41 42 42 43 NSLog(@"startThread: id=%d", mil::thread::get_native_id()); 43 44 WorkerObj* obj = [[WorkerObj alloc] init];45 44 46 45 NSConnection *serverConnection = … … 48 47 sendPort:port1]; 49 48 50 [serverConnection setRootObject: obj];49 [serverConnection setRootObject:self]; 51 50 52 51 NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; 53 [center addObserver: obj52 [center addObserver:self 54 53 selector:@selector(setupServer:) 55 54 name:@"setupServer" object:nil]; … … 61 60 62 61 int main2() { 63 NSLog(@"main2 thread=%x", pthread_self());62 NSLog(@"main2 thread=%x", get_native_thread_id()); 64 63 NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; 65 64 [NSApplication sharedApplication]; … … 67 66 NSLog(@"main: thread id=%d", mil::thread::get_native_id()); 68 67 69 MyThread* thread = [[MyThread alloc] init];70 [NSThread detachNewThreadSelector:@selector(startThread) toTarget:thread withObject:nil];68 port1 = [NSPort port]; 69 port2 = [NSPort port]; 71 70 72 NSNotificationCenter* center = [NSNotificationCenter defaultCenter];73 [center postNotification:74 [NSNotification notificationWithName:@"setupServer" object:nil]];75 71 sleep(1); 76 72 … … 78 74 [[NSConnection alloc] initWithReceivePort:port1 79 75 sendPort:port2]; 80 WorkerObj* proxy = (WorkerObj*)[connection rootProxy]; 76 77 sleep(1); 78 79 MyThread* thread = [[MyThread alloc] init]; 80 [NSThread detachNewThreadSelector:@selector(startThread) toTarget:thread withObject:nil]; 81 82 sleep(1); 83 84 NSNotificationCenter* center = [NSNotificationCenter defaultCenter]; 85 [center postNotification: 86 [NSNotification notificationWithName:@"setupServer" object:nil]]; 87 88 sleep(1); 89 90 WorkerThread* proxy = (WorkerThread*)[connection rootProxy]; 81 91 [proxy someInt: 5]; 82 92 83 84 NSLog(@"main2 x thread=%x", pthread_self()); 85 sleep(2); 86 NSLog(@"main2 y thread=%x", pthread_self()); 93 sleep(1); 87 94 88 95 [pool release];
