The R Project SVN – R – Diff – /branches/R-exp-R5/src/gnuwin32/editor.c

     settext(c, wtitle);
+}
 /*** FILE MANAGEMENT FUNCTIONS ***/
+FILE *R_wfopen(const wchar_t *filename, const wchar_t *mode);
 static void editor_load_file(editor c, const char *name, int enc)
+{
     textbox t = getdata(c);
     EditorData p = getdata(t);
     FILE *f;
     char *buffer = NULL, tmp[MAX_PATH+50];
+    const char *sname;
     long num = 1, bufsize;
+    if(enc == CE_UTF8) {
+	wchar_t wname[MAX_PATH+1];
+	Rf_utf8towcs(wname, name, MAX_PATH+1);
+	f = R_wfopen(wname, L"r");
-    /* we checked that file could be read in the caller */
+	sname = reEnc(name, CE_UTF8, CE_NATIVE, 3);
+    } else {
-    f = R_fopen(name, "r");
+	f = R_fopen(name, "r");
+	sname = name;
+    }
-    if (f == NULL) return;
+    if (f == NULL) {
+	snprintf(tmp, MAX_PATH+50,
+		 G_("unable to open file %s for reading"), sname);
+	R_ShowMessage(tmp);
+	return;
+    }
     p->file = 1;
     strncpy(p->filename, name, MAX_PATH+1);
     bufsize = 0;
     while (num > 0) {
 	buffer = realloc(buffer, bufsize + 3000 + 1);
 	if (num >= 0) {
 	    bufsize += num;
 	    buffer[bufsize] = '\0';
+	}
 	else {
-	    snprintf(tmp, MAX_PATH+50, G_("Could not read from file '%s'"),
+	    snprintf(tmp, MAX_PATH+50,
-		     name);
+		     G_("Could not read from file '%s'"), sname);
 	    askok(tmp);
+	}
+    }
     setlimittext(t, 2 * strlen(buffer));
     settext(t, buffer);
     gsetmodified(t, 0);
     free(buffer);
     fclose(f);
+}
-static void editor_save_file(editor c, const char *name)
+static void editor_save_file(editor c, const char *name, int enc)
+{
     textbox t = getdata(c);
     FILE *f;
     char buf[MAX_PATH+30];
+    const char *sname;
     if (name == NULL)
 	return;
     else {
+	if(enc == CE_UTF8) {
+	    wchar_t wname[MAX_PATH+1];
+	    Rf_utf8towcs(wname, name, MAX_PATH+1);
+	    sname = reEnc(name, CE_UTF8, CE_NATIVE, 3);
+	    f = R_wfopen(wname, L"w");
+	} else {
+	    sname = name;
-	f = R_fopen(name, "w");
+	    f = R_fopen(sname, "w");
+	}
 	if (f == NULL) {
-	    snprintf(buf, MAX_PATH+30, G_("Could not save file '%s'"), name);
+	    snprintf(buf, MAX_PATH+30, G_("Could not save file '%s'"), sname);
 	    askok(buf);
 	    return;
+	}
 	fprintf(f, "%s", gettext(t));
 	fclose(f);
 static void editorsaveas(editor c)
+{
     textbox t = getdata(c);
     EditorData p = getdata(t);
-    char *current_name = (p->file ? p->filename : "");
-    char *name;
+    wchar_t *wname;
-    setuserfilter("R files (*.R)\0*.R\0S files (*.q, *.ssc, *.S)\0*.q;*.ssc;*.S\0All files (*.*)\0*.*\0\0");
+    setuserfilterW(L"R files (*.R)\0*.R\0S files (*.q, *.ssc, *.S)\0*.q;*.ssc;*.S\0All files (*.*)\0*.*\0\0");
-    name = askfilesave(G_("Save script as"), current_name);
+    wname = askfilesaveW(G_("Save script as"), "");
-    if (name == NULL)
+    if (wname == NULL)
 	return;
     else {
+	char name[4*MAX_PATH+1];
+	const char *tname;
+	wcstoutf8(name, wname, MAX_PATH);
+	tname = reEnc(name, CE_UTF8, CE_NATIVE, 3);
-	editor_save_file(c, name);
+	editor_save_file(c, name, CE_UTF8);
 	p->file = 1;
-	strncpy(p->filename, name, MAX_PATH+1);
+	strncpy(p->filename, tname, MAX_PATH+1);
 	gsetmodified(t, 0);
-	editor_set_title(c, name);
+	editor_set_title(c, tname);
 	show(c);
+    }
+}
 static void menueditorsaveas(control m)
 static void editorsave(editor c)
+{
     textbox t = getdata(c);
     EditorData p = getdata(t);
     if (p->file) {  /* save existing file without prompt */
-	const char *current_name = p->filename;
-	editor_save_file(c, current_name);
+	editor_save_file(c, p->filename, CE_UTF8);
 	gsetmodified(t, 0);
+    }
     /* if new file then prompt for name to save as */
     else editorsaveas(c);
+}
     editornew();
+}
 static void editoropen(const char *default_name)
+{
-    char *name;
+    wchar_t *wname;
+    char name[4*MAX_PATH];
+    const char* title;
     int i; textbox t; EditorData p;
-    setuserfilter("R files (*.R)\0*.R\0S files (*.q, *.ssc, *.S)\0*.q;*.ssc;*.S\0All files (*.*)\0*.*\0\0");
+    setuserfilterW(L"R files (*.R)\0*.R\0S files (*.q, *.ssc, *.S)\0*.q;*.ssc;*.S\0All files (*.*)\0*.*\0\0");
-    name = askfilename("Open script", default_name); /* returns NULL if open dialog cancelled */
+    wname = askfilenameW(G_("Open script"), default_name); /* returns NULL if open dialog cancelled */
-    if (name) {
+    if (wname) {
+	wcstoutf8(name, wname, MAX_PATH);
 	/* check if file is already open in an editor. If so, close and open again */
 	for (i = 0; i < neditors; ++i) {
 	    t = getdata(REditors[i]);
 	    p = getdata(t);
 	    if (!strcmp (name, p->filename)) {
 		editorclose(REditors[i]);
 		break;
+	    }
+	}
+	title = reEnc(name, CE_UTF8, CE_NATIVE, 3);
-	Rgui_Edit(name, CE_NATIVE, name, 0);
+	Rgui_Edit(name, CE_UTF8, title, 0);
+    }
+}
 void menueditoropen(control m)
+{
    file. If calling from fix() or edit(), then don't send events to
    the console until editor is closed.  */
 #include <unistd.h>
-/* FIXME UTF-8 */
 int Rgui_Edit(const char *filename, int enc, const char *title,
 	      int modal)
+{
     editor c;
     EditorData p;
     if (!c) {
 	R_ShowMessage(G_("Unable to create editor window"));
 	return 1;
+    }
     if (strlen(filename) > 0) {
-	if (!access(filename, R_OK))
-	    editor_load_file(c, filename, enc);
+	editor_load_file(c, filename, enc);
-	else
-	    R_ShowMessage(G_("Unable to open file for reading"));
 	editor_set_title(c, title);
+    }
     else {
 	editor_set_title(c, G_("Untitled"));
+    }

The R Project SVN R

(root)/branches/R-exp-R5/src/gnuwin32/editor.c @ 77458 – Rev 46784 → 46842