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

     EditorData p = getdata(t);
     strncpy(wtitle, title, EDITORMAXTITLE);
     wtitle[EDITORMAXTITLE] = '\0';
     strcpy(p->title, wtitle);
     if (strlen(wtitle) + strlen(G_("R Editor")) + 3 < EDITORMAXTITLE) {
-    	strcat(wtitle, " - ");
+	strcat(wtitle, " - ");
-    	strcat(wtitle, G_("R Editor"));
+	strcat(wtitle, G_("R Editor"));
+    }
     settext(c, wtitle);
+}
 /*** FILE MANAGEMENT FUNCTIONS ***/
 	if (num >= 0) {
 	    bufsize += num;
 	    buffer[bufsize] = '\0';
+	}
 	else {
 	    snprintf(tmp, MAX_PATH+50, G_("Could not read from file '%s'"),
 		     name);
 	    askok(tmp);
+	}
+    }
     setlimittext(t, 2 * strlen(buffer));
 	fprintf(f, "%s", gettext(t));
 	fclose(f);
+    }
+}
-static void editorsaveas(editor c) {
+static void editorsaveas(editor c)
+{
     textbox t = getdata(c);
     EditorData p = getdata(t);
     char *current_name = (p->file ? p->filename : "");
     char *name;
     setuserfilter("R files (*.R)\0*.R\0S files (*.q, *.ssc, *.S)\0*.q;*.ssc;*.S\0All files (*.*)\0*.*\0\0");
     i = 0;
     while (i < strlen(contents)) {
 	if ( linep + fh >= rr ) { /* new page */
 	    if (page > 1) nextpage(lpr);
 	    sprintf(msg, "Page %d", page++);
-  	    gdrawstr(lpr, f, Black, pt(cc - gstrwidth(lpr, f, msg) - 1, top),
+	    gdrawstr(lpr, f, Black, pt(cc - gstrwidth(lpr, f, msg) - 1, top),
 		     msg);
 	    linep = top + 2*fh;
+	}
 	j = 0;
 	istartline = i;
 	    ++i; ++j;
+	}
 	linebuf = realloc(linebuf, (j+1)*sizeof(char));
 	strncpy(linebuf, &contents[istartline], j);
 	linebuf[j] = '\0';
-  	gdrawstr(lpr, f, Black, pt(left, linep), linebuf);
+	gdrawstr(lpr, f, Black, pt(left, linep), linebuf);
 	linep += fh;
 	++i;
+    }
     free(linebuf);
     if (f != FixedFont) del(f);
 void menueditoropen(control m)
+{
     editor c = getdata(m);
     char *default_name = "";
     /* It really is not clear what is meant here: seems to assume an
        editor window but is called from elsewhere, hopefully with NULL
        (since 2.1.1 patched). */
     if (c) {
 	textbox t = getdata(c);
 	EditorData p = getdata(t);
 	if (p->file) default_name = p->filename;  /* name of currently-open file, if there is one */
 static Rboolean busy_running = FALSE;
 static void editorrun(textbox t)
+{
     if (!busy_running) {
-        long start=0, end=0;
+	long start=0, end=0;
-    	if (CharacterMode != RGui) {
+	if (CharacterMode != RGui) {
-    	    R_ShowMessage(G_("No RGui console to paste to"));
+	    R_ShowMessage(G_("No RGui console to paste to"));
-    	    return;
+	    return;
-    	}
+	}
-    	busy_running = TRUE;
+	busy_running = TRUE;
-    	textselectionex(t, &start, &end);
+	textselectionex(t, &start, &end);
-    	if (start >= end)
+	if (start >= end)
 	    editorrunline(t);
-    	else {
+	else {
 	    editorrunselection(t, start, end);
 	    selecttextex(t, end, end); /* move insertion point to end of selection after running */
-    	}
+	}
-    	busy_running = FALSE;
+	busy_running = FALSE;
+    }
+}
 static void menueditorrun(control m)
+{
     long start, end;
     textbox t = getdata(m);
     EditorData p = getdata(t);
     textselectionex(t, &start, &end);
     if (start < end) {
-        enable(p->mcut);
+	enable(p->mcut);
-        enable(p->mcopy);
+	enable(p->mcopy);
-        enable(p->mdelete);
+	enable(p->mdelete);
-        enable(p->mpopcut);
+	enable(p->mpopcut);
-        enable(p->mpopcopy);
+	enable(p->mpopcopy);
-        enable(p->mpopdelete);
+	enable(p->mpopdelete);
+    }
     else {
 	disable(p->mcut);
 	disable(p->mcopy);
 	disable(p->mdelete);
+}
 static void editorasciikeydown(textbox t, int key)
+{
     /* check whether the text limit is about to be exceeded and
-     increase it if necessary.  Ugh - this callback is called after
+       increase it if necessary.  Ugh - this callback is called after
-     the text is inserted, so we make space for two characters */
+       the text is inserted, so we make space for two characters */
     checklimittext(t, 2);
+}
 /* Set keyboard focus to the text editing area when the editor window receives focus */
     setdata(m, t);
     MCHECK(m = newmenuitem("-", 0, NULL));
     MCHECK(m = newmenuitem(G_("Close script"), 0, menueditorclose));
     setdata(m, c);
     /* MCHECK(m = newmenuitem("-", 0, NULL));
-    MCHECK(m = newmenuitem(G_("Exit"), 0, closeconsole));
+       MCHECK(m = newmenuitem(G_("Exit"), 0, closeconsole));
-    setdata(m, c); */
+       setdata(m, c); */
     MCHECK(newmenu(G_("Edit")));
     MCHECK(m = newmenuitem(G_("Undo"), 'Z', editorundo));
     setdata(m, t);
     MCHECK(m = newmenuitem("-", 0, NULL));
     MCHECK(p->mcut = newmenuitem(G_("Cut"), 'X', editorcut));
+{
     int i, ismod;
     textbox t;
     for (i = 0; i < neditors; i++) {
 	t = getdata(REditors[i]);
- 	ismod = ggetmodified(t);
+	ismod = ggetmodified(t);
 	/* Don't change the modification flag when changing font  */
 	settextfont(t, f);
 	gsetmodified(t, ismod);
 	show(t);
+    }
+    }
     else {
 	editor_set_title(c, G_("Untitled"));
+    }
     show(c);
     p = getdata(getdata(c));
     p->stealconsole = modal;
     if (modal) {
-    	fix_editor_up = TRUE;
+	fix_editor_up = TRUE;
-    	eventloop(c);
+	eventloop(c);
+    }
     return 0;
+}

The R Project SVN R

(root)/branches/R-exp-R5/src/gnuwin32/editor.c @ 63243 – Rev 44575 → 45070