Changeset 2 for trunk

Timestamp:

01/25/06 14:55:17 (3 years ago)

Author:

krobillard

Message:

orca - Fixed read on Windows.
qt - Added append-text native.

Location:

trunk/orca

Files:

• ChangeLog (modified) (1 diff)
• files.c (modified) (4 diffs)
• qt/qorca.cpp (modified) (5 diffs)
• unix/os.h (modified) (1 diff)
• win32/os.h (modified) (1 diff)

trunk/orca/ChangeLog

@@ -4 +4 @@
 V0.0.23 - ?? January 2005
 
+    * Foreach no longer creates a new context. Use 'rebol in config.r to
+       get the old behavior.
     * Script header is now required.
     * Implemented do/args.

trunk/orca/files.c

@@ -248 +248 @@
     if( a1->type == OT_FILE )
     {
+        int n;
         const char* fn;
         OString* str = orSTRING(a1);
@@ -254 +255 @@
 
         fn = str->charArray + a1->series.index;
-        if( orIsDir( fn ) )
+        n = orIsDir( fn );
+        if( n < 0 )
+        {
+            goto read_error;
+        }
+        else if( n == 1 )
         {
             orReadDir( fn );
@@ -280 +286 @@
                 FileHandle fp;
                 OString* buf;
-                int n;
+                int err;
                 int size;
                 int skip = 0;
@@ -323 +329 @@
 
                     n = fileRead( fp, buf->buf, size );
+                    err = fileError( fp );
                     fileClose( fp );
 
-                    if( n != size )
+                    if( err )
                     {
+read_error:
                         orErrorT( OR_ERROR_ACCESS, "read failed on %s", fn );
                         return;
                     }
 
-                    buf->used = size;
+                    buf->used = n;
                     orResultSeries( orRefineSet(REF_READ_BINARY) ?
                                     OT_BINARY : OT_STRING,

trunk/orca/qt/qorca.cpp

@@ -9 +9 @@
 #include <QTabWidget>
 #include <QMessageBox>
+#include <QTextCursor>
 #include "qorca.h"
 #include "cbparse.h"
@@ -791 +792 @@
 #define REF_RF_SAVE    a1+1
 #define REF_RF_DIR     a1+2
+#define REF_RF_INIT    a1+3
+#define REF_RF_PATH    a1+4
 
 static void requestFileNative( OValue* a1 )
 {
     QString fn;
+    QString dir;
     OString* str;
     const char* cp;
 
+    if( orRefineSet( REF_RF_INIT ) )
+    {
+        OValue* ref = REF_RF_PATH;
+        str = orSTRING( ref );
+        orCTermStr( str );
+        dir = orStrChars( str, ref );
+    }
+    else
+    {
+        dir = qEnv.filePath;
+    }
+
     str = orSTRING(a1);
-    cp = str->charArray + a1->series.index;
+    orCTermStr( str );
+    cp = orStrChars( str, a1 );
 
     if( orRefineSet( REF_RF_DIR ) )
     {
-        fn = QFileDialog::getExistingDirectory(0, QString(cp), qEnv.filePath);
+        fn = QFileDialog::getExistingDirectory(0, QString(cp), dir );
     }
     else if( orRefineSet( REF_RF_SAVE ) )
     {
-        fn = QFileDialog::getSaveFileName( 0, QString(cp), qEnv.filePath );
+        fn = QFileDialog::getSaveFileName( 0, QString(cp), dir );
     }
     else
     {
-        fn = QFileDialog::getOpenFileName( 0, QString(cp), qEnv.filePath );
+        fn = QFileDialog::getOpenFileName( 0, QString(cp), dir );
     }
 
@@ -967 +984 @@
 
 
+static void appendTextNative( OValue* a1 )
+{
+    WIDPool::REC* rec = qEnv.pool.record( a1->integer );
+    if( rec )
+    {
+        const OValue* a2 = a1 + 1;
+
+        switch( rec->type )
+        {
+            case WT_LineEdit:
+            {
+                QString cur;
+                QString txt;
+                valueToQString( a2, txt );
+                cur = ((QLineEdit*) rec->widget)->text();
+                cur.append( txt );
+                ((QLineEdit*) rec->widget)->setText( cur );
+            }
+                break;
+
+            case WT_TextEdit:
+            {
+                QString txt;
+                QTextCursor cursor;
+
+                valueToQString( a2, txt );
+
+                QTextEdit* edit = (QTextEdit*) rec->widget;
+
+                cursor = edit->textCursor();
+                cursor.movePosition( QTextCursor::End );
+                cursor.insertText( txt );
+
+                //edit->insertPlainText( txt );
+                //edit->append( txt );  // Adds linefeed before text.
+            }
+                break;
+
+            default:
+                break;
+        }
+    }
+}
+
+
 static void messageNative( OValue* a1 )
 {
@@ -1017 +1079 @@
   "dialog: native [layout [block!]]\n"
   "widget: native [layout [block!]]\n"
-  "request-file: native [title [string!] /save /dir]\n"
+  "request-file: native [title [string!] /save /dir /init path]\n"
   "enable:   native [wid [integer!]]\n"
   "disable:  native [wid [integer!]]\n"
   "widget-value: native [wid [integer!]]\n"
   "set-widget-value: native [wid [integer!] val]\n"
+  "append-text: native [wid [integer!] val]\n"
   "watch-dir: native [dir [string! file!] handler [block!]]\n"
   "message: native [title [string!] msg [string!] /warn]\n"
@@ -1087 +1150 @@
     orNative( (void*) widgetValueNative,    "widget-value" );
     orNative( (void*) setWidgetValueNative, "set-widget-value" );
+    orNative( (void*) appendTextNative,     "append-text" );
     orNative( (void*) messageNative,        "message" );
 #ifdef DIR_WATCHER

trunk/orca/unix/os.h

@@ -49 +49 @@
 #define fileWrite(fh,buf,len)   fwrite(buf,1,len,fh)
 #define fileSeek(fh,off)        fseek(fh,off,SEEK_SET)
+#define fileError(fh)           ferror(fh)
 
 #ifdef __cplusplus

trunk/orca/win32/os.h

@@ -49 +49 @@
 #define fileWrite(fh,buf,len)   fwrite(buf,1,len,fh)
 #define fileSeek(fh,off)        fseek(fh,off,SEEK_SET)
+#define fileError(fh)           ferror(fh)
 
 #ifdef __cplusplus