Changeset 30423 for lang/cplusplus

Timestamp:

02/22/09 12:17:52 (4 years ago)

Author:

saturday06

Message:

yatto ugoita (TT)

Location:

lang/cplusplus/i3/trunk

Files:

• am/i3.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/Common.cpp (modified) (2 diffs)
• src/Initial.h (modified) (1 diff)
• src/Main.cpp (modified) (2 diffs)
• src/ShellManager.cpp (modified) (1 diff)
• src/gui-gnustep/InputWindowCore.cpp (modified) (2 diffs)

lang/cplusplus/i3/trunk/am/i3.am

@@ -45 +45 @@
 src/${GUI_DIR}/CompletionWindowCore.cpp
 
-#i3_SOURCES  = ${i3_SOURCES_NO_MAIN} src/Main.cpp
-i3_SOURCES  = src/Main.cpp
+i3_SOURCES  = ${i3_SOURCES_NO_MAIN} src/Main.cpp
 i3_CXXFLAGS = ${i3_CXXFLAGS_DEFAULT} ${i3_CXXFLAGS_RELEASE}
 i3_LDFLAGS  = ${i3_LDFLAGS_DEFAULT} ${i3_LDFLAGS_RELEASE}

lang/cplusplus/i3/trunk/configure.ac

@@ -133 +133 @@
         fi
 
-        GNUSTEP_CXXFLAGS=`gnustep-config --objc-flags`
-#        GNUSTEP_LIBS=`gnustep-config --objc-libs --base-libs --gui-libs`
-        GNUSTEP_LIBS=`gnustep-config --gui-libs`
-#        GNUSTEP_LIBS="$GNUSTEP_LIBS `gnustep-config --base-libs`"
-#        GNUSTEP_LIBS="$GNUSTEP_LIBS `gnustep-config --gui-libs`"
+GNUSTEP_CXXFLAGS=`gnustep-config --objc-flags`
+GNUSTEP_LIBS=`gnustep-config --gui-libs`
+
         AC_SUBST(GNUSTEP_CXXFLAGS)
         AC_SUBST(GNUSTEP_LIBS)

lang/cplusplus/i3/trunk/src/Common.cpp

@@ -4 +4 @@
 namespace i3
 {
- {
+
+// http://www.gnu.org/software/gettext/FAQ.html#windows_setenv
+int my_setenv (const char * name, const char * value)
+{
     size_t namelen = strlen(name);
-    size_t valuelen = (value == NULL ? 0 : strlen(value));
-#ifdef MOL_OS_WINDOWS
-    /* On Woe32, each process has two copies of the environment variables,
-       one managed by the OS and one managed by the C library. We set
-       the value in both locations, so that other software that looks in
-       one place or the other is guaranteed to see the value. Even if it's
-       a bit slow. See also
-       <http://article.gmane.org/gmane.comp.gnu.mingw.user/8272>
-       <http://article.gmane.org/gmane.comp.gnu.mingw.user/8273>
-       <http://www.cygwin.com/ml/cygwin/1999-04/msg00478.html> */
-    if (!SetEnvironmentVariableA(name, value)) {
+    size_t valuelen = (value==NULL ? 0 : strlen(value));
+#if defined(MOL_OS_WINDOWS)
+    // On Woe32, each process has two copies of the environment variables,
+    // one managed by the OS and one managed by the C library. We set
+    // the value in both locations, so that other software that looks in
+    // one place or the other is guaranteed to see the value. Even if it's
+    // a bit slow. See also
+    // <http://article.gmane.org/gmane.comp.gnu.mingw.user/8272>
+    // <http://article.gmane.org/gmane.comp.gnu.mingw.user/8273>
+    // <http://www.cygwin.com/ml/cygwin/1999-04/msg00478.html> */
+    if (!SetEnvironmentVariableA(name,value))
+    {
         return -1; 
     }
 #endif
 #if defined(HAVE_PUTENV)
-    char* buffer = (char*)malloc(namelen + 1 + valuelen + 1);
-    if (!buffer) {
-        return -1; /* no need to set errno = ENOMEM */
+    char* buffer = (char*)malloc(namelen+1+valuelen+1);
+    if (!buffer)
+    {
+        return -1; // no need to set errno = ENOMEM
     }
-    memcpy(buffer, name, namelen);
-    if (value != NULL) {
+    memcpy(buffer,name,namelen);
+    if (value != NULL)
+    {
         buffer[namelen] = '=';
-        memcpy(buffer + namelen + 1, value, valuelen);
-        buffer[namelen + 1 + valuelen] = 0;
-    } else {
+        memcpy(buffer+namelen+1,value,valuelen);
+        buffer[namelen+1+valuelen] = 0;
+    } 
+    else
+    {
         buffer[namelen] = 0;
     }
     return putenv(buffer);
 #elif defined(HAVE_SETENV)
-    return setenv(name, value, 1);
+    return setenv(name,value,1);
 #else
-    /* Uh oh, neither putenv() nor setenv() ... */
+    // Uh oh, neither putenv() nor setenv() ...
     return -1;
 #endif
@@ -43 +51 @@
 
 }
-
-

lang/cplusplus/i3/trunk/src/Initial.h

@@ -9 +9 @@
 //TODO: nest macro ?
 //XXX
-#if defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)
+#if (defined(WIN32) || defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE)) && !defined(MOL_GUI_GNUSTEP)
 #define _WIN32_IE    0x0200 // IE2
 #define _WIN32_WINNT 0x0400 // NT4.0

lang/cplusplus/i3/trunk/src/Main.cpp

@@ -1 @@
-extern "C" {
-#import <Cocoa/Cocoa.h>
-}
-
-int main(int argc, const char** argv)
-{
-    return NSApplicationMain(argc, argv);
-    //[NSApplication sharedApplication];
-//    [NSApp run];
-//    [NSApplication sharedApplication];
-//    [NSApp setDelegate: [MyDelegate new]];
-//    return 0;
-}
-
-/*
-__imp___Z17NSApplicationMainiPPKc
 #include <PrecompiledHeaders.h>
 #include "Common.h"
@@ -52 +36 @@
 }
 
-
-*/
-

lang/cplusplus/i3/trunk/src/ShellManager.cpp

@@ -44 +44 @@
     sleep(5);
     Input i;
-    i.data = _("Hello, world!");
+    i.data = gettext("Hello, world!");
     mediator.getInputWindow().post(i);
 }

lang/cplusplus/i3/trunk/src/gui-gnustep/InputWindowCore.cpp

@@ -3 +3 @@
 #include "InputWindowCore.h"
 #include "InputWindow.h"
+
+@interface MyDelegate : NSObject
+{
+    NSWindow *myWindow;
+}
+- (void) createMenu;
+- (void) createWindow;
+- (void) applicationWillFinishLaunching: (NSNotification *)not;
+- (void) applicationDidFinishLaunching: (NSNotification *)not;
+@end
+
+@implementation MyDelegate : NSObject 
+- (void) dealloc
+{
+    RELEASE (myWindow);
+}
+
+- (void) createMenu
+{
+    NSMenu *menu;
+
+    menu = AUTORELEASE ([NSMenu new]);
+
+    [menu addItemWithTitle: @"Quit"  
+          action: @selector (terminate:)  
+          keyEquivalent: @"q"];
+
+    [NSApp setMainMenu: menu];
+}
+
+- (void) createWindow
+{
+    NSRect rect = NSMakeRect (100, 100, 200, 200);
+    unsigned int styleMask = NSTitledWindowMask 
+        | NSMiniaturizableWindowMask;
+
+
+    myWindow = [NSWindow alloc];
+    myWindow = [myWindow initWithContentRect: rect
+                         styleMask: styleMask
+                         backing: NSBackingStoreBuffered
+                         defer: NO];
+    [myWindow setTitle: @"This is a test window"];
+}
+
+- (void) applicationWillFinishLaunching: (NSNotification *)not
+{
+    [self createMenu];
+    [self createWindow];
+}
+
+- (void) applicationDidFinishLaunching: (NSNotification *)not;
+{
+    [myWindow makeKeyAndOrderFront: nil];
+}
+@end
 
 namespace i3
@@ -22 +78 @@
 void InputWindowCore<InputWindow>::createUI()
 {
+    [NSApplication sharedApplication];
+    [NSApp setDelegate: [MyDelegate new]];
+    [NSApp run];
 }